From 84319dbca4946cf51d51797252a96ab2a2385efb Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 6 Jun 2024 20:37:26 +0000 Subject: 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.4-otp-25/Dockerfile | 8 ++++++++ ci/elixir-1.13.4-otp-25/build_and_push.sh | 1 + ci/elixir-1.13/Dockerfile | 8 -------- ci/elixir-1.13/build_and_push.sh | 1 - ci/elixir-1.15-otp25/Dockerfile | 8 -------- ci/elixir-1.15-otp25/build_and_push.sh | 1 - ci/elixir-1.15.8-otp-26/Dockerfile | 8 ++++++++ ci/elixir-1.15.8-otp-26/build_and_push.sh | 1 + 10 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 changelog.d/ci-otp-update.skip create mode 100644 ci/elixir-1.13.4-otp-25/Dockerfile create mode 100755 ci/elixir-1.13.4-otp-25/build_and_push.sh delete mode 100644 ci/elixir-1.13/Dockerfile delete mode 100755 ci/elixir-1.13/build_and_push.sh delete mode 100644 ci/elixir-1.15-otp25/Dockerfile delete mode 100755 ci/elixir-1.15-otp25/build_and_push.sh create mode 100644 ci/elixir-1.15.8-otp-26/Dockerfile 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.4-otp-25/Dockerfile b/ci/elixir-1.13.4-otp-25/Dockerfile new file mode 100644 index 000000000..25a1639e8 --- /dev/null +++ b/ci/elixir-1.13.4-otp-25/Dockerfile @@ -0,0 +1,8 @@ +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 +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.13.4-otp-25/build_and_push.sh b/ci/elixir-1.13.4-otp-25/build_and_push.sh new file mode 100755 index 000000000..b8ca1d24d --- /dev/null +++ b/ci/elixir-1.13.4-otp-25/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.13.4-otp-25 --push . diff --git a/ci/elixir-1.13/Dockerfile b/ci/elixir-1.13/Dockerfile deleted file mode 100644 index b8bceb3d9..000000000 --- a/ci/elixir-1.13/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM elixir:1.13.4-otp-24 - -# 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.13/build_and_push.sh b/ci/elixir-1.13/build_and_push.sh deleted file mode 100755 index 64e1856db..000000000 --- a/ci/elixir-1.13/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.13.4-otp-24 --push . diff --git a/ci/elixir-1.15-otp25/Dockerfile b/ci/elixir-1.15-otp25/Dockerfile deleted file mode 100644 index 3335c6e36..000000000 --- a/ci/elixir-1.15-otp25/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM elixir:1.15.7-otp-25 - -# 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.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.8-otp-26/Dockerfile b/ci/elixir-1.15.8-otp-26/Dockerfile new file mode 100644 index 000000000..7142ace04 --- /dev/null +++ b/ci/elixir-1.15.8-otp-26/Dockerfile @@ -0,0 +1,8 @@ +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 +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.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 . -- cgit v1.2.3 From 0641a1058a4fa5a7d12c6b8ae041036a3fbeccf5 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Sat, 8 Jun 2024 15:18:46 -0400 Subject: 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 -- cgit v1.2.3