.woodpecker/.release.yml

@@ -1,13 +1,18 @@
 depends_on:
 - test
 
+when:
+  event: deployment
+
+matrix:
+  platform:
+    - amd64
+    - arm64
+
+platform: linux/${platform}
+
 pipeline:
-
+  ${platform}-glibc:
-  amd64-glibc:
-    when:
-      event:
-        - deployment
-
     group: release
     image: elixir:1.13
     environment:
@@ -26,11 +31,7 @@ pipeline:
       - zip akkoma-$CI_COMMIT_BRANCH-${platform}.zip -r release
       - rclone copy akkoma-$CI_COMMIT_BRANCH-${platform}.zip scaleway:akkoma-updates/
 
-  amd64-musl:
+  ${platform}-musl:
-    when:
-      event:
-        - deployment
-
     group: release
     image: elixir:1.13-alpine
     environment:
@@ -48,49 +49,3 @@ pipeline:
       - mix release --path release
       - zip akkoma-$CI_COMMIT_BRANCH-${platform}.zip -r release
       - rclone copy akkoma-$CI_COMMIT_BRANCH-${platform}.zip scaleway:akkoma-updates/
-
-  arm64-glibc:
-    when:
-      event:
-        - deployment
-
-    group: release
-    image: arm64v8/elixir:1.13
-    environment:
-      MIX_ENV: prod
-    commands:
-      - apt-get update && apt-get install -y cmake libmagic-dev rclone
-      - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
-      - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
-      - chmod +x scaleway-cli
-      - ./scaleway-cli object config install type=rclone
-      - echo "import Mix.Config" > config/prod.secret.exs
-      - mix deps.get --only prod
-      - mkdir release
-      - export PLEROMA_BUILD_BRANCH=$CI_COMMIT_BRANCH
-      - mix release --path release
-      - zip akkoma-$CI_COMMIT_BRANCH-${platform}.zip -r release
-      - rclone copy akkoma-$CI_COMMIT_BRANCH-${platform}.zip scaleway:akkoma-updates/
-
-  arm64-musl:
-    when:
-      event:
-        - deployment
-
-    group: release
-    image: arm64v8/elixir:1.13-alpine
-    environment:
-      MIX_ENV: prod
-    commands:
-      - apk add git gcc g++ musl-dev make cmake file-dev rclone wget
-      - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
-      - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
-      - chmod +x scaleway-cli
-      - ./scaleway-cli object config install type=rclone
-      - echo "import Mix.Config" > config/prod.secret.exs
-      - mix deps.get --only prod
-      - mkdir release
-      - export PLEROMA_BUILD_BRANCH=${CI_COMMIT_BRANCH}
-      - mix release --path release
-      - zip akkoma-$CI_COMMIT_BRANCH-${platform}.zip -r release
-      - rclone copy akkoma-$CI_COMMIT_BRANCH-${platform}.zip scaleway:akkoma-updates/

lib/pleroma/web/common_api.ex

@@ -271,7 +271,7 @@ def unreact_with_emoji(id, user, emoji) do
          {:ok, activity, _} <- Pipeline.common_pipeline(undo, local: true) do
       {:ok, activity}
     else
-      _ ->
+      e ->
         {:error, dgettext("errors", "Could not remove reaction emoji")}
     end
   end

test/pleroma/web/metadata/providers/open_graph_test.exs

@@ -144,7 +144,7 @@ test "video attachments have image thumbnail with WxH metadata with Preview Prox
             [
               property: "og:image",
               content:
-                "http://localhost:4001/proxy/preview/LzAnlke-l5oZbNzWsrHfprX1rGw/aHR0cHM6Ly9wbGVyb21hLmdvdi9hYm91dC9qdWNoZS53ZWJt/juche.webm"
+                "http://localhost:4001/proxy/preview/FElXD3PfapZSKq-u62Dc3BiaIM8/aHR0cHM6Ly9wbGVyb21hLmdvdi9hYm91dC9qdWNoZS53ZWJt/juche.webm"
             ], []} in result
   end