Merge pull request '2022.09 stable' (#208) from develop into stable

[akkoma] / .woodpecker.yml

diff --git a/.woodpecker.yml b/.woodpecker.yml
index be497b531cd7bdb1001ac67ecf32ba9f92844c9e..955bbe7fd59b611083ce42b401c5c7c136cc47fb 100644 (file)
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -29,6 +29,7 @@ variables:
   - &tag-build "export BUILD_TAG=$${CI_COMMIT_TAG:-\"$CI_COMMIT_BRANCH\"} && export PLEROMA_BUILD_BRANCH=$BUILD_TAG"
 
   - &clean "(rm -rf release || true) && (rm -rf _build || true) && (rm -rf /root/.mix)"
+  - &mix-clean "mix deps.clean --all && mix clean"
 
 services:
   postgres:
@@ -92,7 +93,6 @@ pipeline:
       MIX_ENV: prod
       DEBIAN_FRONTEND: noninteractive
     commands:
-      - rm config/emoji.txt
       - apt-get update && apt-get install -y cmake libmagic-dev rclone zip imagemagick libmagic-dev git build-essential g++ wget
       - *clean
       - echo "import Config" > config/prod.secret.exs
@@ -100,22 +100,19 @@ pipeline:
       - *tag-build
       - mix deps.get --only prod
       - mix release --path release
-      - zip akkoma-amd64.zip -r release
+      - zip akkoma-ubuntu-jammy.zip -r release
 
   release-ubuntu22:
     image: akkoma/releaser
     <<: *on-release
     secrets: *scw-secrets
     commands:
-      - export SOURCE=akkoma-amd64.zip
-      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64.zip
+      - 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
-    environment:
-      SOURCE: akkoma-amd64.zip
-      DEST: scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64.zip
 
   debian-bullseye:
-    image: elixir:1.13.4
+    image: akkoma/debian
     <<: *on-release
     environment:
       MIX_ENV: prod
@@ -126,6 +123,7 @@ pipeline:
       - 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
@@ -136,7 +134,9 @@ pipeline:
     secrets: *scw-secrets
     commands:
       - export SOURCE=akkoma-amd64.zip
-      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-debian-bullseye.zip
+      - 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
       - /bin/sh /entrypoint.sh
 
   # Canonical amd64-musl
@@ -149,7 +149,7 @@ pipeline:
       - apk add git gcc g++ musl-dev make cmake file-dev rclone wget zip imagemagick
       - *clean
       - *setup-hex
-      - mix deps.clean --all
+      - *mix-clean
       - *tag-build
       - mix deps.get --only prod
       - mix release --path release