diff --git a/.woodpecker/docker-armv7.yaml b/.woodpecker/docker-armv7.yaml index c921a56f9..d001da787 100644 --- a/.woodpecker/docker-armv7.yaml +++ b/.woodpecker/docker-armv7.yaml @@ -1,7 +1,4 @@ when: - # Temporary PR validation while arm/v7 Docker builds are being brought up. - - event: pull_request - path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**", "Dockerfile" ] - event: push branch: ${CI_REPO_DEFAULT_BRANCH} path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**", "Dockerfile" ] @@ -20,6 +17,10 @@ variables: docker_variables: &docker_variables repo: pleroma/pleroma registry: git.pleroma.social + username: + from_secret: pleroma-ci-user + password: + from_secret: pleroma-ci-password armv7_build_settings: &armv7_build_settings <<: *docker_variables build_args: @@ -28,24 +29,8 @@ variables: - ALPINE_IMG=arm32v7/alpine - ALPINE_VER=3.20 extra_opts: --custom-platform=linux/arm/v7 - armv7_push_settings: &armv7_push_settings - <<: *armv7_build_settings - username: - from_secret: pleroma-ci-user - password: - from_secret: pleroma-ci-password steps: - docker-armv7-pr: - image: woodpeckerci/plugin-kaniko:2.3.1 - when: - - event: pull_request - settings: - <<: *armv7_build_settings - dry_run: true - tags: - - armv7-pr-check - docker-develop-armv7: image: woodpeckerci/plugin-kaniko:2.3.1 when: @@ -54,7 +39,7 @@ steps: - event: manual branch: ${CI_REPO_DEFAULT_BRANCH} settings: - <<: *armv7_push_settings + <<: *armv7_build_settings tags: - latest-armv7 - develop-armv7 @@ -65,7 +50,7 @@ steps: when: - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""' settings: - <<: *armv7_push_settings + <<: *armv7_build_settings tags: - latest-armv7 - stable-armv7 @@ -77,7 +62,7 @@ steps: - event: tag - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""' settings: - <<: *armv7_push_settings + <<: *armv7_build_settings tags: - latest-armv7 - stable-armv7 diff --git a/.woodpecker/unit-testing-elixir-1.15.yaml b/.woodpecker/unit-testing-elixir-1.15.yaml index a5bcc0ef3..0f8eac566 100644 --- a/.woodpecker/unit-testing-elixir-1.15.yaml +++ b/.woodpecker/unit-testing-elixir-1.15.yaml @@ -24,10 +24,11 @@ steps: entrypoint: *script_file_entrypoint environment: MIX_ENV: test + VIX_COMPILATION_MODE: PLATFORM_PROVIDED_LIBVIPS DB_HOST: postgres DB_PORT: 5432 commands: - - apk add --no-cache build-base cmake exiftool ffmpeg file-dev git openssl + - apk add --no-cache build-base cmake exiftool ffmpeg vips-dev file-dev git openssl - adduser -D -h /home/testuser testuser - mkdir -p /home/testuser/.mix /home/testuser/.hex - chown -R testuser:testuser . /home/testuser diff --git a/.woodpecker/unit-testing-elixir-1.19.yaml b/.woodpecker/unit-testing-elixir-1.19.yaml index 06dc6758e..60b0826a7 100644 --- a/.woodpecker/unit-testing-elixir-1.19.yaml +++ b/.woodpecker/unit-testing-elixir-1.19.yaml @@ -24,10 +24,11 @@ steps: entrypoint: *script_file_entrypoint environment: MIX_ENV: test + VIX_COMPILATION_MODE: PLATFORM_PROVIDED_LIBVIPS DB_HOST: postgres DB_PORT: 5432 commands: - - apk add --no-cache build-base cmake exiftool ffmpeg file-dev git openssl + - apk add --no-cache build-base cmake exiftool ffmpeg vips-dev file-dev git openssl - adduser -D -h /home/testuser testuser - mkdir -p /home/testuser/.mix /home/testuser/.hex - chown -R testuser:testuser . /home/testuser diff --git a/changelog.d/docker-arm32v7-pr-forbid-build.skip b/changelog.d/docker-arm32v7-pr-forbid-build.skip new file mode 100644 index 000000000..e69de29bb diff --git a/changelog.d/unit-testing-build-vix.skip b/changelog.d/unit-testing-build-vix.skip new file mode 100644 index 000000000..e69de29bb