From 84319dbca4946cf51d51797252a96ab2a2385efb Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 6 Jun 2024 20:37:26 +0000 Subject: [PATCH 1/2] OTP updates Update to otp25 for Elixir 1.13; otp26 for Elixir 1.15 --- .gitlab-ci.yml | 12 ++++++------ changelog.d/ci-otp-update.skip | 0 ci/{elixir-1.13 => elixir-1.13.4-otp-25}/Dockerfile | 2 +- .../build_and_push.sh | 2 +- ci/elixir-1.15-otp25/build_and_push.sh | 1 - .../Dockerfile | 2 +- ci/elixir-1.15.8-otp-26/build_and_push.sh | 1 + 7 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 changelog.d/ci-otp-update.skip rename ci/{elixir-1.13 => elixir-1.13.4-otp-25}/Dockerfile (91%) rename ci/{elixir-1.13 => elixir-1.13.4-otp-25}/build_and_push.sh (52%) delete mode 100755 ci/elixir-1.15-otp25/build_and_push.sh rename ci/{elixir-1.15-otp25 => elixir-1.15.8-otp-26}/Dockerfile (91%) create mode 100755 ci/elixir-1.15.8-otp-26/build_and_push.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21d7b2242..09e3de1d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.13.4-otp-24 +image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.13.4-otp-25 variables: &global_variables # Only used for the release @@ -72,7 +72,7 @@ check-changelog: tags: - amd64 -build-1.13.4: +build-1.13.4-otp-25: extends: - .build_changes_policy - .using-ci-base @@ -80,12 +80,12 @@ build-1.13.4: script: - mix compile --force -build-1.15.7-otp-25: +build-1.15.8-otp-26: extends: - .build_changes_policy - .using-ci-base stage: build - image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15-otp25 + image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15.8-otp-26 allow_failure: true script: - mix compile --force @@ -144,12 +144,12 @@ unit-testing-1.12.3: coverage_format: cobertura path: coverage.xml -unit-testing-1.15.7-otp-25: +unit-testing-1.15.8-otp-26: extends: - .build_changes_policy - .using-ci-base stage: test - image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15-otp25 + image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15.8-otp-26 allow_failure: true cache: *testing_cache_policy services: *testing_services diff --git a/changelog.d/ci-otp-update.skip b/changelog.d/ci-otp-update.skip new file mode 100644 index 000000000..e69de29bb diff --git a/ci/elixir-1.13/Dockerfile b/ci/elixir-1.13.4-otp-25/Dockerfile similarity index 91% rename from ci/elixir-1.13/Dockerfile rename to ci/elixir-1.13.4-otp-25/Dockerfile index b8bceb3d9..25a1639e8 100644 --- a/ci/elixir-1.13/Dockerfile +++ b/ci/elixir-1.13.4-otp-25/Dockerfile @@ -1,4 +1,4 @@ -FROM elixir:1.13.4-otp-24 +FROM elixir:1.13.4-otp-25 # Single RUN statement, otherwise intermediate images are created # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run diff --git a/ci/elixir-1.13/build_and_push.sh b/ci/elixir-1.13.4-otp-25/build_and_push.sh similarity index 52% rename from ci/elixir-1.13/build_and_push.sh rename to ci/elixir-1.13.4-otp-25/build_and_push.sh index 64e1856db..b8ca1d24d 100755 --- a/ci/elixir-1.13/build_and_push.sh +++ b/ci/elixir-1.13.4-otp-25/build_and_push.sh @@ -1 +1 @@ -docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.13.4-otp-24 --push . +docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.13.4-otp-25 --push . diff --git a/ci/elixir-1.15-otp25/build_and_push.sh b/ci/elixir-1.15-otp25/build_and_push.sh deleted file mode 100755 index a28e0d33c..000000000 --- a/ci/elixir-1.15-otp25/build_and_push.sh +++ /dev/null @@ -1 +0,0 @@ -docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15-otp25 --push . diff --git a/ci/elixir-1.15-otp25/Dockerfile b/ci/elixir-1.15.8-otp-26/Dockerfile similarity index 91% rename from ci/elixir-1.15-otp25/Dockerfile rename to ci/elixir-1.15.8-otp-26/Dockerfile index 3335c6e36..7142ace04 100644 --- a/ci/elixir-1.15-otp25/Dockerfile +++ b/ci/elixir-1.15.8-otp-26/Dockerfile @@ -1,4 +1,4 @@ -FROM elixir:1.15.7-otp-25 +FROM elixir:1.15.8-otp-26 # Single RUN statement, otherwise intermediate images are created # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run diff --git a/ci/elixir-1.15.8-otp-26/build_and_push.sh b/ci/elixir-1.15.8-otp-26/build_and_push.sh new file mode 100755 index 000000000..59bc63454 --- /dev/null +++ b/ci/elixir-1.15.8-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.15.8-otp-26 --push . From 0641a1058a4fa5a7d12c6b8ae041036a3fbeccf5 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Sat, 8 Jun 2024 15:18:46 -0400 Subject: [PATCH 2/2] Update job names --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09e3de1d9..45dcd6091 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,7 +121,7 @@ benchmark: - mix ecto.migrate - mix pleroma.load_testing -unit-testing-1.12.3: +unit-testing-1.13.4-otp-25: extends: - .build_changes_policy - .using-ci-base @@ -155,7 +155,7 @@ unit-testing-1.15.8-otp-26: services: *testing_services script: *testing_script -unit-testing-1.12-erratic: +unit-testing-1.13.4-otp-25-erratic: extends: - .build_changes_policy - .using-ci-base