Combine ubuntu and debian builds

.woodpecker/build-amd64.yml

@@ -36,8 +36,8 @@ variables:
 
 pipeline:
   # Canonical amd64
-  ubuntu22:
+  debian-bookworm:
-    image: hexpm/elixir:1.15.4-erlang-25.3.2.5-ubuntu-jammy-20230126
+    image: hexpm/elixir:1.15.4-erlang-25.3.2.5-debian-bookworm-20230612
     <<: *on-release
     environment:
       MIX_ENV: prod
@@ -50,45 +50,19 @@ pipeline:
       - *tag-build
       - mix deps.get --only prod
       - mix release --path release
-      - zip akkoma-ubuntu-jammy.zip -r release
-
-  release-ubuntu22:
-    image: akkoma/releaser
-    <<: *on-release
-    secrets: *scw-secrets
-    commands:
-      - export SOURCE=akkoma-ubuntu-jammy.zip
-      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-ubuntu-jammy.zip
-      - /bin/sh /entrypoint.sh
-      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64-ubuntu-jammy.zip
-      - /bin/sh /entrypoint.sh
-
-  debian-bookworm:
-    image: hexpm/elixir:1.15.4-erlang-25.3.2.5-debian-bookworm-20230612
-    <<: *on-release
-    environment:
-      MIX_ENV: prod
-      DEBIAN_FRONTEND: noninteractive
-    commands:
-      - apt-get update && apt-get install -y cmake libmagic-dev rclone zip imagemagick libmagic-dev git build-essential gcc make g++ wget
-      - *clean
-      - echo "import Config" > config/prod.secret.exs
-      - *setup-hex
-      - *tag-build
-      - *mix-clean
-      - mix deps.get --only prod
-      - mix release --path release
       - zip akkoma-amd64.zip -r release
 
-  release-debian:
+  release-debian-bookworm:
     image: akkoma/releaser
     <<: *on-release
     secrets: *scw-secrets
     commands:
       - export SOURCE=akkoma-amd64.zip
+      # AMD64
       - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64.zip
       - /bin/sh /entrypoint.sh
-      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-debian-stable.zip
+      # Ubuntu jammy (currently compatible)
+      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64-ubuntu-jammy.zip
       - /bin/sh /entrypoint.sh
 
   # Canonical amd64-musl

.woodpecker/build-arm64.yml

@@ -36,8 +36,8 @@ variables:
 
 pipeline:
   # Canonical arm64
-  ubuntu22:
+  debian-bookworm:
-    image: hexpm/elixir:1.15.4-erlang-25.3.2.5-ubuntu-jammy-20230126
+    image: hexpm/elixir:1.15.4-erlang-25.3.2.5-debian-bookworm-20230612
     <<: *on-release
     environment:
       MIX_ENV: prod
@@ -50,44 +50,18 @@ pipeline:
       - *tag-build
       - mix deps.get --only prod
       - mix release --path release
-      - zip akkoma-ubuntu-jammy.zip -r release
+      - zip akkoma-arm64.zip -r release
 
-  release-ubuntu22:
+  release-debian-bookworm:
     image: akkoma/releaser:arm64
     <<: *on-release
     secrets: *scw-secrets
     commands:
-      - export SOURCE=akkoma-ubuntu-jammy.zip
+      - export SOURCE=akkoma-arm64.zip
       - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-arm64-ubuntu-jammy.zip
       - /bin/sh /entrypoint.sh
-
-  debian-bookworm:
-    image: hexpm/elixir:1.15.4-erlang-25.3.2.5-debian-bookworm-20230612
-    <<: *on-stable
-    environment:
-      MIX_ENV: prod
-      DEBIAN_FRONTEND: noninteractive
-    commands:
-      - apt-get update && apt-get install -y cmake libmagic-dev rclone zip imagemagick libmagic-dev git build-essential gcc make g++ wget
-      - *clean
-      - echo "import Config" > config/prod.secret.exs
-      - *setup-hex
-      - *tag-build
-      - *mix-clean
-      - mix deps.get --only prod
-      - mix release --path release
-      - zip akkoma-arm64.zip -r release
-
-  release-debian:
-    image: akkoma/releaser:arm64
-    <<: *on-stable
-    secrets: *scw-secrets
-    commands:
-      - export SOURCE=akkoma-arm64.zip
       - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-arm64.zip
       - /bin/sh /entrypoint.sh
-      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-debian-stable.zip
-      - /bin/sh /entrypoint.sh
 
   # Canonical arm64-musl
   musl:

CHANGELOG.md

@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Debian OTP builds are now from a base of bookworm, which is OpenSSLv3 compatible.
   If you use debian OTP builds you will have to update your local system to
   bookworm (currently: stable).
+- Ubuntu and debian builds are compatible again! (for now...)
 - Blocks/Mutes now return from max ID to min ID, in line with mastodon.
 - The AnonymizeFilename filter is now enabled by default.
 

docs/docs/installation/otp_en.md

@@ -15,18 +15,14 @@ While in theory OTP releases are possbile to install on any compatible machine,
 
 ### Detecting flavour
 
-This is a little more complex than it used to be (thanks ubuntu)
-
 Use the following mapping to figure out your flavour:
 
 | distribution    | architecture       | flavour             | available branches  |
 | --------------- | ------------------ | ------------------- | ------------------- |
-| debian bullseye | amd64              | amd64               | develop, stable     |
+| debian bookworm | amd64              | amd64               | develop, stable     |
-| debian bullseye | arm64              | arm64               | stable              |
+| debian bookworm | arm64              | arm64               | stable              |
-| ubuntu focal    | amd64              | amd64               | develop, stable     |
+| ubuntu jammy    | amd64              | amd64               | develop, stable     |
-| ubuntu focal    | arm64              | arm64               | stable              |
+| ubuntu jammy    | arm64              | arm64               | develop, stable     |
-| ubuntu jammy    | amd64              | amd64-ubuntu-jammy  | develop, stable     |
-| ubuntu jammy    | arm64              | arm64-ubuntu-jammy  | develop, stable     |
 | alpine          | amd64              | amd64-musl          | stable              |
 | alpine          | arm64              | arm64-musl          | stable              |