diff options
| author | lain <lain@soykaf.club> | 2024-12-21 09:20:20 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-12-21 09:20:20 +0000 |
| commit | 138ead9856512506cc030ed429ffd05d4d03d14d (patch) | |
| tree | 07ea324cb32417cc1bf4a0bb60df2e74846e4219 | |
| parent | 64660423c5540761f3924d342ce60656423b7eb4 (diff) | |
| parent | fe3e61f6ece0335627f675e04a93917e6c613c6c (diff) | |
| download | pleroma-138ead9856512506cc030ed429ffd05d4d03d14d.tar.gz pleroma-138ead9856512506cc030ed429ffd05d4d03d14d.zip | |
Merge branch 'mergeback/2.8.0-image-fixes' into 'develop'
Mergeback/2.8.0 image fixes
See merge request pleroma/pleroma!4306
| -rw-r--r-- | .gitlab-ci.yml | 18 | ||||
| -rw-r--r-- | changelog.d/ci-builder-skip-arm32.skip | 0 | ||||
| -rw-r--r-- | changelog.d/hexpm-build-images.skip | 0 |
3 files changed, 12 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39947c75e..675d0e067 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.14.5-otp-25 variables: &global_variables # Only used for the release - ELIXIR_VER: 1.14.5 + ELIXIR_VER: 1.17.3 POSTGRES_DB: pleroma_test POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres @@ -272,7 +272,8 @@ stop_review_app: amd64: stage: release - image: elixir:$ELIXIR_VER + image: + name: hexpm/elixir-amd64:1.17.3-erlang-26.2.5.6-ubuntu-focal-20241011 only: &release-only - stable@pleroma/pleroma - develop@pleroma/pleroma @@ -297,8 +298,9 @@ amd64: variables: &release-variables MIX_ENV: prod VIX_COMPILATION_MODE: PLATFORM_PROVIDED_LIBVIPS + DEBIAN_FRONTEND: noninteractive before_script: &before-release - - apt-get update && apt-get install -y cmake libmagic-dev libvips-dev erlang-dev + - apt-get update && apt-get install -y cmake libmagic-dev libvips-dev erlang-dev git - echo "import Config" > config/prod.secret.exs - mix local.hex --force - mix local.rebar --force @@ -313,7 +315,8 @@ amd64-musl: stage: release artifacts: *release-artifacts only: *release-only - image: elixir:$ELIXIR_VER-alpine + image: + name: hexpm/elixir-amd64:1.17.3-erlang-26.2.5.6-alpine-3.17.9 tags: - amd64 cache: *release-cache @@ -327,6 +330,7 @@ amd64-musl: arm: stage: release + allow_failure: true artifacts: *release-artifacts only: *release-only tags: @@ -355,7 +359,8 @@ arm64: only: *release-only tags: - arm - image: arm64v8/elixir:$ELIXIR_VER + image: + name: hexpm/elixir-arm64:1.17.3-erlang-26.2.5.6-ubuntu-focal-20241011 cache: *release-cache variables: *release-variables before_script: *before-release @@ -367,7 +372,8 @@ arm64-musl: only: *release-only tags: - arm - image: arm64v8/elixir:$ELIXIR_VER-alpine + image: + name: hexpm/elixir-arm64:1.17.3-erlang-26.2.5.6-alpine-3.17.9 cache: *release-cache variables: *release-variables before_script: *before-release-musl diff --git a/changelog.d/ci-builder-skip-arm32.skip b/changelog.d/ci-builder-skip-arm32.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/ci-builder-skip-arm32.skip diff --git a/changelog.d/hexpm-build-images.skip b/changelog.d/hexpm-build-images.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/hexpm-build-images.skip |