From 62d9333eb0e6706c8c2c2e1919f0e119773a9e78 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Mon, 1 Jul 2024 15:58:32 +0000 Subject: [PATCH] CI: Switch to Elixir 1.17 --- .gitlab-ci.yml | 8 ++++---- changelog.d/ci-elixir-1.17.skip | 0 ci/elixir-1.17.1-otp-26/Dockerfile | 8 ++++++++ ci/elixir-1.17.1-otp-26/build_and_push.sh | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 changelog.d/ci-elixir-1.17.skip create mode 100644 ci/elixir-1.17.1-otp-26/Dockerfile create mode 100755 ci/elixir-1.17.1-otp-26/build_and_push.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e219d598..eaa9d3b25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,12 +78,12 @@ build-1.13.4-otp-25: script: - mix compile --force -build-1.16.3-otp-26: +build-1.17.1-otp-26: extends: - .build_changes_policy - .using-ci-base stage: build - image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.16.3-otp-26 + image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.17.1-otp-26 script: - mix compile --force @@ -141,12 +141,12 @@ unit-testing-1.13.4-otp-25: coverage_format: cobertura path: coverage.xml -unit-testing-1.16.3-otp-26: +unit-testing-1.17.1-otp-26: extends: - .build_changes_policy - .using-ci-base stage: test - image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.16.3-otp-26 + image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.17.1-otp-26 cache: *testing_cache_policy services: *testing_services script: *testing_script diff --git a/changelog.d/ci-elixir-1.17.skip b/changelog.d/ci-elixir-1.17.skip new file mode 100644 index 000000000..e69de29bb diff --git a/ci/elixir-1.17.1-otp-26/Dockerfile b/ci/elixir-1.17.1-otp-26/Dockerfile new file mode 100644 index 000000000..c1ee2fb30 --- /dev/null +++ b/ci/elixir-1.17.1-otp-26/Dockerfile @@ -0,0 +1,8 @@ +FROM elixir:1.17.1-otp-26 + +# Single RUN statement, otherwise intermediate images are created +# https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run +RUN apt-get update &&\ + apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\ + mix local.hex --force &&\ + mix local.rebar --force diff --git a/ci/elixir-1.17.1-otp-26/build_and_push.sh b/ci/elixir-1.17.1-otp-26/build_and_push.sh new file mode 100755 index 000000000..2fbeaed6a --- /dev/null +++ b/ci/elixir-1.17.1-otp-26/build_and_push.sh @@ -0,0 +1 @@ +docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.17.1-otp-26 --push .