diff options
| author | Mark Felder <feld@feld.me> | 2024-01-21 04:10:20 +0000 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2024-01-21 04:10:20 +0000 |
| commit | 8f0051d73929ad515cc1582f727d21e49af40d6a (patch) | |
| tree | 042c247770c9427986366b5943705e3a76befca4 | |
| parent | 058fa5471a0d0bfe9eb774e9aa34504ab4d9d90a (diff) | |
| download | pleroma-8f0051d73929ad515cc1582f727d21e49af40d6a.tar.gz pleroma-8f0051d73929ad515cc1582f727d21e49af40d6a.zip | |
Rename 1.15 image to include otp25, clarify test names
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | ci/elixir-1.15-otp25/Dockerfile (renamed from ci/elixir-1.15/Dockerfile) | 0 | ||||
| -rwxr-xr-x | ci/elixir-1.15-otp25/build_and_push.sh (renamed from ci/elixir-1.15/build_and_push.sh) | 2 |
3 files changed, 4 insertions, 4 deletions
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 index a2b566873..a2b566873 100644 --- a/ci/elixir-1.15/Dockerfile +++ b/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 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 . |