pleroma

commit: cf99b1c1fd89553f072cc5a466aaebbe59d3e618
parent 61f86774d183b8ba130551999ea498e5f5c71681
Author: rinpatch <rinpatch@sdf.org>
Date:   Tue, 17 Nov 2020 14:52:08 +0000

Merge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop'

Specify the architecture for arm gitlab jobs

See merge request pleroma/pleroma!3139
Diffstat:
M
.gitlab-ci.yml
9
++++-----

1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -229,7 +229,7 @@ arm:
   only: *release-only
   tags:
     - arm32
-  image: elixir:1.10.3
+  image: arm32v7/elixir:1.10.3
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release
@@ -241,7 +241,7 @@ arm-musl:
   only: *release-only
   tags:
     - arm32
-  image: elixir:1.10.3-alpine
+  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