Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

[akkoma] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 168401d3ca48d43776b439bed68ec03fe8254357..9a754ed782563e32b897af74935f9b6c0c5dd770 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -228,7 +228,7 @@ arm:
   artifacts: *release-artifacts
   only: *release-only
   tags:
-    - arm32on64
+    - arm32
   image: arm32v7/elixir:1.10.3
   cache: *release-cache
   variables: *release-variables
@@ -240,8 +240,8 @@ arm-musl:
   artifacts: *release-artifacts
   only: *release-only
   tags:
-    - arm32on64
-  image: arm32v7/elixir:1.10.3
+    - arm32
+  image: arm32v7/elixir:1.10.3-alpine
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release-musl
@@ -253,7 +253,7 @@ arm64:
   only: *release-only
   tags:
     - arm
-  image: elixir:1.10.3
+  image: arm64v8/elixir:1.10.3
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release
@@ -265,8 +265,7 @@ arm64-musl:
   only: *release-only
   tags:
     - arm
-  # TODO: Replace with upstream image when 1.9.0 comes out
-  image: elixir:1.10.3-alpine
+  image: arm64v8/elixir:1.10.3-alpine
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release-musl