Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into webpush-polls

Browse Source
This commit is contained in:
Mark Felder 2024-06-09 08:37:24 -04:00
commit 51eeb80822
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitlab-ci.yml
View File

@ -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 variables: &global_variables
# Only used for the release # Only used for the release
@ -72,7 +72,7 @@ check-changelog:
tags: tags:
- amd64 - amd64
build-1.13.4: build-1.13.4-otp-25:
extends: extends:
- .build_changes_policy - .build_changes_policy
- .using-ci-base - .using-ci-base
@ -80,12 +80,12 @@ build-1.13.4:
script: script:
- mix compile --force - mix compile --force
build-1.15.7-otp-25: build-1.15.8-otp-26:
extends: extends:
- .build_changes_policy - .build_changes_policy
- .using-ci-base - .using-ci-base
stage: build 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 allow_failure: true
script: script:
- mix compile --force - mix compile --force
@ -121,7 +121,7 @@ benchmark:
- mix ecto.migrate - mix ecto.migrate
- mix pleroma.load_testing - mix pleroma.load_testing
unit-testing-1.12.3: unit-testing-1.13.4-otp-25:
extends: extends:
- .build_changes_policy - .build_changes_policy
- .using-ci-base - .using-ci-base
@ -144,18 +144,18 @@ unit-testing-1.12.3:
coverage_format: cobertura coverage_format: cobertura
path: coverage.xml path: coverage.xml
unit-testing-1.15.7-otp-25: unit-testing-1.15.8-otp-26:
extends: extends:
- .build_changes_policy - .build_changes_policy
- .using-ci-base - .using-ci-base
stage: test 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 allow_failure: true
cache: *testing_cache_policy cache: *testing_cache_policy
services: *testing_services services: *testing_services
script: *testing_script script: *testing_script
unit-testing-1.12-erratic: unit-testing-1.13.4-otp-25-erratic:
extends: extends:
- .build_changes_policy - .build_changes_policy
- .using-ci-base - .using-ci-base

0
changelog.d/ci-otp-update.skip Normal file
View File

2
ci/elixir-1.13/Dockerfile → ci/elixir-1.13.4-otp-25/Dockerfile
View File

@ -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 # Single RUN statement, otherwise intermediate images are created
# https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run

2
ci/elixir-1.13/build_and_push.sh → ci/elixir-1.13.4-otp-25/build_and_push.sh
View File

@ -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 .

1
ci/elixir-1.15-otp25/build_and_push.sh
View File

@ -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 .

2
ci/elixir-1.15-otp25/Dockerfile → ci/elixir-1.15.8-otp-26/Dockerfile
View File

@ -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 # Single RUN statement, otherwise intermediate images are created
# https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run

1
ci/elixir-1.15.8-otp-26/build_and_push.sh Executable file
View File

@ -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 .