diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-11-17 14:52:08 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-11-17 14:52:08 +0000 |
| commit | cf99b1c1fd89553f072cc5a466aaebbe59d3e618 (patch) | |
| tree | 3ee82668d53055b41976565d0b1ee72a880f1055 | |
| parent | 61f86774d183b8ba130551999ea498e5f5c71681 (diff) | |
| parent | ffc2bb70ff297bfe2e24afa591553a4410128fb7 (diff) | |
| download | pleroma-cf99b1c1fd89553f072cc5a466aaebbe59d3e618.tar.gz pleroma-cf99b1c1fd89553f072cc5a466aaebbe59d3e618.zip | |
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
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd0c5c8d4..9a754ed78 100644 --- 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 |