From f0334dce309190b8a20dd876c965349e9d0fbca4 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 27 Jun 2024 13:52:39 +0000 Subject: [PATCH 1/3] Add 1.16.3 ci image --- ci/elixir-1.16.3-otp-26/Dockerfile | 8 ++++++++ ci/elixir-1.16.3-otp-26/build_and_push.sh | 1 + 2 files changed, 9 insertions(+) create mode 100644 ci/elixir-1.16.3-otp-26/Dockerfile create mode 100755 ci/elixir-1.16.3-otp-26/build_and_push.sh diff --git a/ci/elixir-1.16.3-otp-26/Dockerfile b/ci/elixir-1.16.3-otp-26/Dockerfile new file mode 100644 index 000000000..dce5ac636 --- /dev/null +++ b/ci/elixir-1.16.3-otp-26/Dockerfile @@ -0,0 +1,8 @@ +FROM elixir:1.16.3-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.16.3-otp-26/build_and_push.sh b/ci/elixir-1.16.3-otp-26/build_and_push.sh new file mode 100755 index 000000000..b93376c79 --- /dev/null +++ b/ci/elixir-1.16.3-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.16.3-otp-26 --push . From 6e932495dc4dc20f533d233f147f07f6d7a59ee8 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 27 Jun 2024 14:05:59 +0000 Subject: [PATCH 2/3] Change CI jobs to Elixir 1.16.3 --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e471eb38..b622f1424 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.15.8-otp-26: +build-1.16.3-otp-26: extends: - .build_changes_policy - .using-ci-base stage: build - image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15.8-otp-26 + image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.16.3-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.15.8-otp-26: +unit-testing-1.16.3-otp-26: extends: - .build_changes_policy - .using-ci-base stage: test - image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15.8-otp-26 + image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.16.3-otp-26 cache: *testing_cache_policy services: *testing_services script: *testing_script From 01ed270dbac3945b5558f96d83b46faa642912a7 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 27 Jun 2024 14:06:15 +0000 Subject: [PATCH 3/3] Changelog --- changelog.d/ci-elixir-1.16.skip | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 changelog.d/ci-elixir-1.16.skip diff --git a/changelog.d/ci-elixir-1.16.skip b/changelog.d/ci-elixir-1.16.skip new file mode 100644 index 000000000..e69de29bb