summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml12
-rw-r--r--changelog.d/ci-otp-update.skip0
-rw-r--r--ci/elixir-1.13.4-otp-25/Dockerfile (renamed from ci/elixir-1.13/Dockerfile)2
-rwxr-xr-xci/elixir-1.13.4-otp-25/build_and_push.sh (renamed from ci/elixir-1.13/build_and_push.sh)2
-rwxr-xr-xci/elixir-1.15-otp25/build_and_push.sh1
-rw-r--r--ci/elixir-1.15.8-otp-26/Dockerfile (renamed from ci/elixir-1.15-otp25/Dockerfile)2
-rwxr-xr-xci/elixir-1.15.8-otp-26/build_and_push.sh1
7 files changed, 10 insertions, 10 deletions
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
--- /dev/null
+++ b/changelog.d/ci-otp-update.skip
diff --git a/ci/elixir-1.13/Dockerfile b/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
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
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 .