diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca17be7c1..41132864b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -147,13 +147,13 @@ unit-testing-1.15.7-otp-25: - .build_changes_policy - .using-ci-base stage: test - image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15 + image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15-otp25 allow_failure: true cache: *testing_cache_policy services: *testing_services script: *testing_script -unit-testing-erratic: +unit-testing-1.12-erratic: extends: - .build_changes_policy - .using-ci-base @@ -167,7 +167,7 @@ unit-testing-erratic: - mix ecto.migrate - mix test --only=erratic -unit-testing-rum: +unit-testing-1.12-rum: extends: - .build_changes_policy - .using-ci-base diff --git a/ci/elixir-1.15/Dockerfile b/ci/elixir-1.15-otp25/Dockerfile similarity index 100% rename from ci/elixir-1.15/Dockerfile rename to ci/elixir-1.15-otp25/Dockerfile diff --git a/ci/elixir-1.15/build_and_push.sh b/ci/elixir-1.15-otp25/build_and_push.sh similarity index 52% rename from ci/elixir-1.15/build_and_push.sh rename to ci/elixir-1.15-otp25/build_and_push.sh index 79cf89344..06fe74f34 100755 --- a/ci/elixir-1.15/build_and_push.sh +++ b/ci/elixir-1.15-otp25/build_and_push.sh @@ -1 +1 @@ -docker buildx build --platform linux/amd64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15 --push . +docker buildx build --platform linux/amd64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15-otp25 --push .