Merge pull request 'CI: Fix failing OTP builds, switch to mirrored Woodpecker multi-arch manifest plugin' (#7989) from wpc-ci-bump into develop

Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7989
This commit is contained in:
Phantasm 2026-09-08 11:54:49 +00:00
commit b3f95adfb7
7 changed files with 16 additions and 12 deletions

View file

@ -18,7 +18,7 @@ labels:
steps: steps:
docker-develop-combine: docker-develop-combine:
image: git.fluffytail.org/phnt/wpc-docker-tagger:latest image: &docker_image git.pleroma.social/phnt/wpc-docker-tagger:0.9.1
when: when:
- event: push - event: push
branch: ${CI_REPO_DEFAULT_BRANCH} branch: ${CI_REPO_DEFAULT_BRANCH}
@ -31,14 +31,14 @@ steps:
tags: tags:
- latest - latest
- develop - develop
- ${CI_COMMIT_SHA:0:8} - "${CI_COMMIT_SHA:0:8}"
username: username:
from_secret: pleroma-ci-user from_secret: pleroma-ci-user
password: password:
from_secret: pleroma-ci-password from_secret: pleroma-ci-password
docker-stable-combine: docker-stable-combine:
image: git.fluffytail.org/phnt/wpc-docker-tagger:latest image: *docker_image
when: when:
- evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""' - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""'
settings: settings:
@ -46,10 +46,10 @@ steps:
tags: &stable_docker_tags tags: &stable_docker_tags
- latest - latest
- stable - stable
- ${CI_COMMIT_SHA:0:8} - "${CI_COMMIT_SHA:0:8}"
docker-stable-tag-combine: docker-stable-tag-combine:
image: git.fluffytail.org/phnt/wpc-docker-tagger:latest image: *docker_image
when: when:
- event: tag - event: tag
- evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""' - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""'
@ -57,4 +57,4 @@ steps:
<<: *docker_settings <<: *docker_settings
tags: tags:
- <<: *stable_docker_tags - <<: *stable_docker_tags
- ${CI_COMMIT_TAG} - "${CI_COMMIT_TAG}"

View file

@ -33,10 +33,10 @@ variables:
- mkdir release - mkdir release
- export PLEROMA_BUILD_BRANCH=${CI_COMMIT_BRANCH} - export PLEROMA_BUILD_BRANCH=${CI_COMMIT_BRANCH}
- mix release --path release - mix release --path release
build_image_amd64: &build_image_amd64 docker.io/hexpm/elixir-amd64:1.17.3-erlang-27.3.4.2-alpine-3.22.1 build_image_amd64: &build_image_amd64 docker.io/hexpm/elixir:1.17.3-erlang-27.3.4.17-alpine-3.22.5
build_image_arm: &build_image_arm docker.io/arm32v7/elixir:1.17.3-alpine build_image_arm: &build_image_arm docker.io/arm32v7/elixir:1.17.3-alpine
build_image_arm64: &build_image_arm64 docker.io/hexpm/elixir-arm64:1.17.3-erlang-27.3.4.2-alpine-3.22.1 build_image_arm64: &build_image_arm64 docker.io/hexpm/elixir:1.17.3-erlang-27.3.4.17-alpine-3.22.5
artifacts_uploader_image: &artifacts_uploader_image docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0 artifacts_uploader_image: &artifacts_uploader_image docker.io/woodpeckercommunity/plugin-gitea-package:0.5.1
artifacts_uploader_settings: &artifacts_uploader_settings artifacts_uploader_settings: &artifacts_uploader_settings
user: user:
from_secret: pleroma-ci-user from_secret: pleroma-ci-user

View file

@ -33,10 +33,10 @@ variables:
- mkdir release - mkdir release
- export PLEROMA_BUILD_BRANCH=${CI_COMMIT_BRANCH} - export PLEROMA_BUILD_BRANCH=${CI_COMMIT_BRANCH}
- mix release --path release - mix release --path release
build_image_amd64: &build_image_amd64 docker.io/hexpm/elixir-amd64:1.17.3-erlang-27.3.4.2-ubuntu-noble-20250716 build_image_amd64: &build_image_amd64 docker.io/hexpm/elixir:1.17.3-erlang-27.3.4.17-ubuntu-noble-20260810
build_image_arm: &build_image_arm docker.io/arm32v7/elixir:1.17.3 build_image_arm: &build_image_arm docker.io/arm32v7/elixir:1.17.3
build_image_arm64: &build_image_arm64 docker.io/hexpm/elixir-arm64:1.17.3-erlang-27.3.4.2-ubuntu-noble-20250716 build_image_arm64: &build_image_arm64 docker.io/hexpm/elixir:1.17.3-erlang-27.3.4.17-ubuntu-noble-20260810
artifacts_uploader_image: &artifacts_uploader_image docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0 artifacts_uploader_image: &artifacts_uploader_image docker.io/woodpeckercommunity/plugin-gitea-package:0.5.1
artifacts_uploader_settings: &artifacts_uploader_settings artifacts_uploader_settings: &artifacts_uploader_settings
user: user:
from_secret: pleroma-ci-user from_secret: pleroma-ci-user

View file

@ -52,12 +52,14 @@ steps:
services: services:
postgres: postgres:
image: docker.io/postgres:13-alpine image: docker.io/postgres:13-alpine
failure: ignore
environment: environment:
POSTGRES_DB: pleroma_test POSTGRES_DB: pleroma_test
POSTGRES_USER: postgres POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres POSTGRES_PASSWORD: postgres
paradedb: paradedb:
image: docker.io/paradedb/paradedb:0.24.3-pg15@sha256:997d62f6c2605becb7c45878af3f8c8c698f355006b675b3ce212d4eb2d14f2e image: docker.io/paradedb/paradedb:0.24.3-pg15@sha256:997d62f6c2605becb7c45878af3f8c8c698f355006b675b3ce212d4eb2d14f2e
failure: ignore
environment: environment:
POSTGRES_DB: paradedb POSTGRES_DB: paradedb
POSTGRES_USER: postgres POSTGRES_USER: postgres

View file

@ -40,6 +40,7 @@ steps:
services: services:
postgres: postgres:
image: postgres:13-alpine image: postgres:13-alpine
failure: ignore
environment: environment:
POSTGRES_DB: pleroma_test POSTGRES_DB: pleroma_test
POSTGRES_USER: postgres POSTGRES_USER: postgres

View file

@ -40,6 +40,7 @@ steps:
services: services:
postgres: postgres:
image: postgres:13-alpine image: postgres:13-alpine
failure: ignore
environment: environment:
POSTGRES_DB: pleroma_test POSTGRES_DB: pleroma_test
POSTGRES_USER: postgres POSTGRES_USER: postgres

View file