From 64fea06c40756045f38857f6d454542f8662dd9f Mon Sep 17 00:00:00 2001 From: "blacksmith-sh[bot]" <157653362+blacksmith-sh[bot]@users.noreply.github.com> Date: Sat, 18 Jul 2026 12:57:50 +0000 Subject: [PATCH 1/7] Migrate workflows to Blacksmith --- .github/workflows/baseline.yml | 12 +++++------- .github/workflows/commit-authorship.yml | 2 +- .github/workflows/dependabot-auto-merge.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/job-arrow-extension.yml | 4 ++-- .github/workflows/job-extension-tests.yml | 2 +- .github/workflows/job-flow-php-extension.yml | 4 ++-- .github/workflows/job-mutation-tests.yml | 2 +- .github/workflows/job-pg-query-extension.yml | 4 ++-- .github/workflows/job-phpunit-telemetry-tests.yml | 2 +- .github/workflows/job-static-analyze.yml | 2 +- .github/workflows/job-tests.yml | 2 +- .github/workflows/monorepo-split.yml | 2 +- .github/workflows/pr-check.yml | 2 +- .github/workflows/release.yml | 10 ++++------ .github/workflows/test-website.yml | 2 +- 16 files changed, 26 insertions(+), 30 deletions(-) diff --git a/.github/workflows/baseline.yml b/.github/workflows/baseline.yml index d8bbfbae7f..e012fdae80 100644 --- a/.github/workflows/baseline.yml +++ b/.github/workflows/baseline.yml @@ -20,7 +20,7 @@ permissions: jobs: build-archives: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: contents: read packages: write @@ -58,8 +58,8 @@ jobs: run: | ./build/flow.phar --version - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4 + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Set up QEMU uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0 @@ -72,7 +72,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build Docker Image - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7 + uses: useblacksmith/build-push-action@v2 with: context: . file: ./Dockerfile @@ -81,8 +81,6 @@ jobs: tags: | ghcr.io/flow-php/flow:latest target: flow - cache-from: type=gha - cache-to: type=gha,mode=max - name: "Prepare artifact name" if: ${{ github.event_name == 'push' }} @@ -98,7 +96,7 @@ jobs: overwrite: true publish-website: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 strategy: fail-fast: false matrix: diff --git a/.github/workflows/commit-authorship.yml b/.github/workflows/commit-authorship.yml index cf4cf0f0b0..adc7174737 100644 --- a/.github/workflows/commit-authorship.yml +++ b/.github/workflows/commit-authorship.yml @@ -14,7 +14,7 @@ permissions: # Code borrowed from: https://github.com/carthage-software/mago/blob/main/.github/workflows/commit-authorship.yml jobs: check-commit-authorship: - runs-on: "ubuntu-latest" + runs-on: "blacksmith-4vcpu-ubuntu-2404" steps: - name: "Checkout" uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 726f67e7c4..a857e2f2ef 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -6,7 +6,7 @@ permissions: jobs: dependabot: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }} steps: - name: Dependabot metadata diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8d8bfe45d9..b9bbb7fb9d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -21,7 +21,7 @@ permissions: jobs: documentation-linter: - runs-on: "ubuntu-latest" + runs-on: "blacksmith-4vcpu-ubuntu-2404" steps: - name: "Checkout" uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/.github/workflows/job-arrow-extension.yml b/.github/workflows/job-arrow-extension.yml index ab96b99c7b..63da5574a4 100644 --- a/.github/workflows/job-arrow-extension.yml +++ b/.github/workflows/job-arrow-extension.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-latest'] + os: ['blacksmith-4vcpu-ubuntu-2404', 'macos-latest'] php: ['8.3', '8.4', '8.5'] steps: @@ -121,7 +121,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-latest'] + os: ['blacksmith-4vcpu-ubuntu-2404', 'macos-latest'] steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/.github/workflows/job-extension-tests.yml b/.github/workflows/job-extension-tests.yml index 82874aee21..94e80ae8fc 100644 --- a/.github/workflows/job-extension-tests.yml +++ b/.github/workflows/job-extension-tests.yml @@ -17,7 +17,7 @@ jobs: - "8.4" - "8.5" operating-system: - - "ubuntu-latest" + - "blacksmith-4vcpu-ubuntu-2404" steps: - name: "Checkout" diff --git a/.github/workflows/job-flow-php-extension.yml b/.github/workflows/job-flow-php-extension.yml index dac8c86034..9264a1a608 100644 --- a/.github/workflows/job-flow-php-extension.yml +++ b/.github/workflows/job-flow-php-extension.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-latest'] + os: ['blacksmith-4vcpu-ubuntu-2404', 'macos-latest'] php: ['8.3', '8.4', '8.5'] steps: @@ -118,7 +118,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-latest'] + os: ['blacksmith-4vcpu-ubuntu-2404', 'macos-latest'] steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/.github/workflows/job-mutation-tests.yml b/.github/workflows/job-mutation-tests.yml index 3933ef1554..ac2fcb397f 100644 --- a/.github/workflows/job-mutation-tests.yml +++ b/.github/workflows/job-mutation-tests.yml @@ -12,7 +12,7 @@ jobs: php-version: - "8.3" operating-system: - - "ubuntu-latest" + - "blacksmith-4vcpu-ubuntu-2404" steps: - name: "Checkout" diff --git a/.github/workflows/job-pg-query-extension.yml b/.github/workflows/job-pg-query-extension.yml index f562038bcd..5ec2709594 100644 --- a/.github/workflows/job-pg-query-extension.yml +++ b/.github/workflows/job-pg-query-extension.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-latest'] + os: ['blacksmith-4vcpu-ubuntu-2404', 'macos-latest'] php: ['8.3', '8.4', '8.5'] steps: @@ -62,7 +62,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-latest'] + os: ['blacksmith-4vcpu-ubuntu-2404', 'macos-latest'] steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/.github/workflows/job-phpunit-telemetry-tests.yml b/.github/workflows/job-phpunit-telemetry-tests.yml index 80fad3eab7..2ef756cb12 100644 --- a/.github/workflows/job-phpunit-telemetry-tests.yml +++ b/.github/workflows/job-phpunit-telemetry-tests.yml @@ -11,7 +11,7 @@ permissions: jobs: tests: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 15 services: postgres: diff --git a/.github/workflows/job-static-analyze.yml b/.github/workflows/job-static-analyze.yml index 5a03c154da..01e24d7cc2 100644 --- a/.github/workflows/job-static-analyze.yml +++ b/.github/workflows/job-static-analyze.yml @@ -13,7 +13,7 @@ jobs: php-version: - "8.3" operating-system: - - "ubuntu-latest" + - "blacksmith-4vcpu-ubuntu-2404" steps: - name: "Checkout" diff --git a/.github/workflows/job-tests.yml b/.github/workflows/job-tests.yml index 230dbfb600..59fda798f9 100644 --- a/.github/workflows/job-tests.yml +++ b/.github/workflows/job-tests.yml @@ -54,7 +54,7 @@ jobs: - "8.4" - "8.5" operating-system: - - "ubuntu-latest" + - "blacksmith-4vcpu-ubuntu-2404" steps: - name: "Checkout" diff --git a/.github/workflows/monorepo-split.yml b/.github/workflows/monorepo-split.yml index dec932787d..6b8d90334c 100644 --- a/.github/workflows/monorepo-split.yml +++ b/.github/workflows/monorepo-split.yml @@ -15,7 +15,7 @@ permissions: jobs: packages_split: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 strategy: fail-fast: false diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index d9adb415de..c00a202263 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -13,7 +13,7 @@ jobs: automation_github_token: "${{ secrets.GITHUB_TOKEN }}" pull-request-size: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 continue-on-error: true permissions: pull-requests: write diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c49534b62..83de9c55f1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: php-version: - "8.3" operating-system: - - "ubuntu-latest" + - "blacksmith-4vcpu-ubuntu-2404" steps: - name: "Checkout" @@ -63,8 +63,8 @@ jobs: --output="./build/flow.phar.asc" ./build/flow.phar - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4 + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Set up QEMU uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0 @@ -77,7 +77,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build Docker Image - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7 + uses: useblacksmith/build-push-action@v2 with: context: . file: ./Dockerfile @@ -86,8 +86,6 @@ jobs: tags: | ghcr.io/flow-php/flow:${{ github.ref_name }} target: flow - cache-from: type=gha - cache-to: type=gha,mode=max - name: "Upload binaries to release" if: ${{ startsWith(github.ref, 'refs/tags/') }} diff --git a/.github/workflows/test-website.yml b/.github/workflows/test-website.yml index c2fe5e5d04..48f055e3de 100644 --- a/.github/workflows/test-website.yml +++ b/.github/workflows/test-website.yml @@ -23,7 +23,7 @@ jobs: php-version: - "8.3" operating-system: - - "ubuntu-latest" + - "blacksmith-4vcpu-ubuntu-2404" steps: - name: "Checkout" From 387c6bfa0b481eef76dde4ac6bec4fce6dc253e5 Mon Sep 17 00:00:00 2001 From: norberttech Date: Sat, 18 Jul 2026 13:04:48 +0000 Subject: [PATCH 2/7] ci: remove pre-installed ext-redis in setup-php-env Blacksmith runner images ship ext-redis 5.3.7, which conflicts with symfony/cache (requires ext-redis >= 6.1) and breaks composer install. No job in this repo needs the redis extension, so remove it via setup-php. Co-authored-by: Codesmith --- .github/actions/setup-php-env/action.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup-php-env/action.yml b/.github/actions/setup-php-env/action.yml index 32b1938846..f1d31f0cfb 100644 --- a/.github/actions/setup-php-env/action.yml +++ b/.github/actions/setup-php-env/action.yml @@ -78,7 +78,10 @@ runs: tools: ${{ inputs.tools }} php-version: ${{ inputs.php-version }} ini-values: ${{ inputs.ini-values }} - extensions: ${{ inputs.extensions }} + # The runner image ships ext-redis 5.3.7 pre-installed, which conflicts with + # symfony/cache (requires ext-redis >= 6.1) and breaks `composer install`. + # No job in this repo uses the redis extension, so always remove it (":redis"). + extensions: "${{ inputs.extensions }}, :redis" coverage: ${{ inputs.coverage != '' && inputs.coverage || null }} env: ${{ inputs.php-env != '' && fromJSON(inputs.php-env) || fromJSON('{}') }} From cfc5a76b7beab11263b83fe84ce788519f8bbfe8 Mon Sep 17 00:00:00 2001 From: norberttech Date: Sat, 18 Jul 2026 13:07:51 +0000 Subject: [PATCH 3/7] ci: declare Blacksmith runner label for actionlint actionlint rejects blacksmith-4vcpu-ubuntu-2404 as an unknown runner label, failing 'just lint'. Declare it as a self-hosted-runner label. Co-authored-by: Codesmith --- .github/actionlint.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .github/actionlint.yaml diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml new file mode 100644 index 0000000000..f281a7d036 --- /dev/null +++ b/.github/actionlint.yaml @@ -0,0 +1,4 @@ +self-hosted-runner: + # Blacksmith runner labels are custom labels actionlint does not know about. + labels: + - blacksmith-4vcpu-ubuntu-2404 From b84f3facd67daf9d1936e3f14e9297a0f41ddd38 Mon Sep 17 00:00:00 2001 From: norberttech Date: Sat, 18 Jul 2026 13:10:40 +0000 Subject: [PATCH 4/7] ci: pin Blacksmith Docker actions to commit hashes zizmor's unpinned-uses audit (blanket pin-to-hash policy) failed on the useblacksmith/setup-docker-builder and useblacksmith/build-push-action references added by the migration. Pin them to full commit SHAs. Co-authored-by: Codesmith --- .github/workflows/baseline.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/baseline.yml b/.github/workflows/baseline.yml index e012fdae80..4a2be3cb2f 100644 --- a/.github/workflows/baseline.yml +++ b/.github/workflows/baseline.yml @@ -59,7 +59,7 @@ jobs: ./build/flow.phar --version - name: Setup Blacksmith Builder - uses: useblacksmith/setup-docker-builder@v1 + uses: useblacksmith/setup-docker-builder@6ff44f8e5255f9d8aa31ef22f7e57a2d926b7da0 # v1.11.0 - name: Set up QEMU uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0 @@ -72,7 +72,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build Docker Image - uses: useblacksmith/build-push-action@v2 + uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8 # v2.2.0 with: context: . file: ./Dockerfile diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 83de9c55f1..d2e7641400 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,7 +64,7 @@ jobs: ./build/flow.phar - name: Setup Blacksmith Builder - uses: useblacksmith/setup-docker-builder@v1 + uses: useblacksmith/setup-docker-builder@6ff44f8e5255f9d8aa31ef22f7e57a2d926b7da0 # v1.11.0 - name: Set up QEMU uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0 @@ -77,7 +77,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build Docker Image - uses: useblacksmith/build-push-action@v2 + uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8 # v2.2.0 with: context: . file: ./Dockerfile From f42a7ee7f681d06d0fa0dcaf5ecea04cbb41fe28 Mon Sep 17 00:00:00 2001 From: norberttech Date: Sat, 18 Jul 2026 13:22:33 +0000 Subject: [PATCH 5/7] ci: install compatible ext-redis instead of removing it symfony/cache v7.4 conflicts with ext-redis <6.1, and the Blacksmith runner image ships 5.3.7, which broke composer install. Rather than dropping the extension (which disables the PSRSimpleRedisCache tests the repo ships REDIS_HOST/REDIS_PORT config for), pin phpredis 6.3.0 via setup-php so a >=6.1 build compatible with PHP 8.3-8.5 is installed. Co-authored-by: Codesmith --- .github/actions/setup-php-env/action.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-php-env/action.yml b/.github/actions/setup-php-env/action.yml index f1d31f0cfb..0f5452c080 100644 --- a/.github/actions/setup-php-env/action.yml +++ b/.github/actions/setup-php-env/action.yml @@ -80,8 +80,9 @@ runs: ini-values: ${{ inputs.ini-values }} # The runner image ships ext-redis 5.3.7 pre-installed, which conflicts with # symfony/cache (requires ext-redis >= 6.1) and breaks `composer install`. - # No job in this repo uses the redis extension, so always remove it (":redis"). - extensions: "${{ inputs.extensions }}, :redis" + # Pin a compatible phpredis (>= 6.1, and new enough to build on PHP 8.5) so the + # extension stays available for the redis cache tests instead of being dropped. + extensions: "${{ inputs.extensions }}, redis-6.3.0" coverage: ${{ inputs.coverage != '' && inputs.coverage || null }} env: ${{ inputs.php-env != '' && fromJSON(inputs.php-env) || fromJSON('{}') }} From 88e229206de0aab85dc93dc86d3e7b173dd24774 Mon Sep 17 00:00:00 2001 From: norberttech Date: Sat, 18 Jul 2026 13:22:33 +0000 Subject: [PATCH 6/7] ci: run Blacksmith jobs on 2vcpu runners instead of 4vcpu Right-size the migrated workflows down one tier from blacksmith-4vcpu-ubuntu-2404 to blacksmith-2vcpu-ubuntu-2404. Co-authored-by: Codesmith --- .github/actionlint.yaml | 2 +- .github/workflows/baseline.yml | 4 ++-- .github/workflows/commit-authorship.yml | 2 +- .github/workflows/dependabot-auto-merge.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/job-arrow-extension.yml | 4 ++-- .github/workflows/job-extension-tests.yml | 2 +- .github/workflows/job-flow-php-extension.yml | 4 ++-- .github/workflows/job-mutation-tests.yml | 2 +- .github/workflows/job-pg-query-extension.yml | 4 ++-- .github/workflows/job-phpunit-telemetry-tests.yml | 2 +- .github/workflows/job-static-analyze.yml | 2 +- .github/workflows/job-tests.yml | 2 +- .github/workflows/monorepo-split.yml | 2 +- .github/workflows/pr-check.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test-website.yml | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index f281a7d036..400799b054 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -1,4 +1,4 @@ self-hosted-runner: # Blacksmith runner labels are custom labels actionlint does not know about. labels: - - blacksmith-4vcpu-ubuntu-2404 + - blacksmith-2vcpu-ubuntu-2404 diff --git a/.github/workflows/baseline.yml b/.github/workflows/baseline.yml index 4a2be3cb2f..e136cf053d 100644 --- a/.github/workflows/baseline.yml +++ b/.github/workflows/baseline.yml @@ -20,7 +20,7 @@ permissions: jobs: build-archives: - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: blacksmith-2vcpu-ubuntu-2404 permissions: contents: read packages: write @@ -96,7 +96,7 @@ jobs: overwrite: true publish-website: - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: blacksmith-2vcpu-ubuntu-2404 strategy: fail-fast: false matrix: diff --git a/.github/workflows/commit-authorship.yml b/.github/workflows/commit-authorship.yml index adc7174737..268d1fcc07 100644 --- a/.github/workflows/commit-authorship.yml +++ b/.github/workflows/commit-authorship.yml @@ -14,7 +14,7 @@ permissions: # Code borrowed from: https://github.com/carthage-software/mago/blob/main/.github/workflows/commit-authorship.yml jobs: check-commit-authorship: - runs-on: "blacksmith-4vcpu-ubuntu-2404" + runs-on: "blacksmith-2vcpu-ubuntu-2404" steps: - name: "Checkout" uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index a857e2f2ef..e8c2ef4ee5 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -6,7 +6,7 @@ permissions: jobs: dependabot: - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: blacksmith-2vcpu-ubuntu-2404 if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }} steps: - name: Dependabot metadata diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b9bbb7fb9d..c27f3d044f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -21,7 +21,7 @@ permissions: jobs: documentation-linter: - runs-on: "blacksmith-4vcpu-ubuntu-2404" + runs-on: "blacksmith-2vcpu-ubuntu-2404" steps: - name: "Checkout" uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/.github/workflows/job-arrow-extension.yml b/.github/workflows/job-arrow-extension.yml index 63da5574a4..49897170e8 100644 --- a/.github/workflows/job-arrow-extension.yml +++ b/.github/workflows/job-arrow-extension.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['blacksmith-4vcpu-ubuntu-2404', 'macos-latest'] + os: ['blacksmith-2vcpu-ubuntu-2404', 'macos-latest'] php: ['8.3', '8.4', '8.5'] steps: @@ -121,7 +121,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['blacksmith-4vcpu-ubuntu-2404', 'macos-latest'] + os: ['blacksmith-2vcpu-ubuntu-2404', 'macos-latest'] steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/.github/workflows/job-extension-tests.yml b/.github/workflows/job-extension-tests.yml index 94e80ae8fc..bd9caf3a50 100644 --- a/.github/workflows/job-extension-tests.yml +++ b/.github/workflows/job-extension-tests.yml @@ -17,7 +17,7 @@ jobs: - "8.4" - "8.5" operating-system: - - "blacksmith-4vcpu-ubuntu-2404" + - "blacksmith-2vcpu-ubuntu-2404" steps: - name: "Checkout" diff --git a/.github/workflows/job-flow-php-extension.yml b/.github/workflows/job-flow-php-extension.yml index 9264a1a608..374eb4cb9e 100644 --- a/.github/workflows/job-flow-php-extension.yml +++ b/.github/workflows/job-flow-php-extension.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['blacksmith-4vcpu-ubuntu-2404', 'macos-latest'] + os: ['blacksmith-2vcpu-ubuntu-2404', 'macos-latest'] php: ['8.3', '8.4', '8.5'] steps: @@ -118,7 +118,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['blacksmith-4vcpu-ubuntu-2404', 'macos-latest'] + os: ['blacksmith-2vcpu-ubuntu-2404', 'macos-latest'] steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/.github/workflows/job-mutation-tests.yml b/.github/workflows/job-mutation-tests.yml index ac2fcb397f..cc06005a7c 100644 --- a/.github/workflows/job-mutation-tests.yml +++ b/.github/workflows/job-mutation-tests.yml @@ -12,7 +12,7 @@ jobs: php-version: - "8.3" operating-system: - - "blacksmith-4vcpu-ubuntu-2404" + - "blacksmith-2vcpu-ubuntu-2404" steps: - name: "Checkout" diff --git a/.github/workflows/job-pg-query-extension.yml b/.github/workflows/job-pg-query-extension.yml index 5ec2709594..38d40c05cd 100644 --- a/.github/workflows/job-pg-query-extension.yml +++ b/.github/workflows/job-pg-query-extension.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['blacksmith-4vcpu-ubuntu-2404', 'macos-latest'] + os: ['blacksmith-2vcpu-ubuntu-2404', 'macos-latest'] php: ['8.3', '8.4', '8.5'] steps: @@ -62,7 +62,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['blacksmith-4vcpu-ubuntu-2404', 'macos-latest'] + os: ['blacksmith-2vcpu-ubuntu-2404', 'macos-latest'] steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/.github/workflows/job-phpunit-telemetry-tests.yml b/.github/workflows/job-phpunit-telemetry-tests.yml index 2ef756cb12..d7aa641dc9 100644 --- a/.github/workflows/job-phpunit-telemetry-tests.yml +++ b/.github/workflows/job-phpunit-telemetry-tests.yml @@ -11,7 +11,7 @@ permissions: jobs: tests: - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: blacksmith-2vcpu-ubuntu-2404 timeout-minutes: 15 services: postgres: diff --git a/.github/workflows/job-static-analyze.yml b/.github/workflows/job-static-analyze.yml index 01e24d7cc2..6a6b5fe6e3 100644 --- a/.github/workflows/job-static-analyze.yml +++ b/.github/workflows/job-static-analyze.yml @@ -13,7 +13,7 @@ jobs: php-version: - "8.3" operating-system: - - "blacksmith-4vcpu-ubuntu-2404" + - "blacksmith-2vcpu-ubuntu-2404" steps: - name: "Checkout" diff --git a/.github/workflows/job-tests.yml b/.github/workflows/job-tests.yml index 59fda798f9..b64fa6736a 100644 --- a/.github/workflows/job-tests.yml +++ b/.github/workflows/job-tests.yml @@ -54,7 +54,7 @@ jobs: - "8.4" - "8.5" operating-system: - - "blacksmith-4vcpu-ubuntu-2404" + - "blacksmith-2vcpu-ubuntu-2404" steps: - name: "Checkout" diff --git a/.github/workflows/monorepo-split.yml b/.github/workflows/monorepo-split.yml index 6b8d90334c..8ad714ab6f 100644 --- a/.github/workflows/monorepo-split.yml +++ b/.github/workflows/monorepo-split.yml @@ -15,7 +15,7 @@ permissions: jobs: packages_split: - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: blacksmith-2vcpu-ubuntu-2404 strategy: fail-fast: false diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index c00a202263..9042481b39 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -13,7 +13,7 @@ jobs: automation_github_token: "${{ secrets.GITHUB_TOKEN }}" pull-request-size: - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: blacksmith-2vcpu-ubuntu-2404 continue-on-error: true permissions: pull-requests: write diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d2e7641400..49a305af59 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: php-version: - "8.3" operating-system: - - "blacksmith-4vcpu-ubuntu-2404" + - "blacksmith-2vcpu-ubuntu-2404" steps: - name: "Checkout" diff --git a/.github/workflows/test-website.yml b/.github/workflows/test-website.yml index 48f055e3de..8529e63446 100644 --- a/.github/workflows/test-website.yml +++ b/.github/workflows/test-website.yml @@ -23,7 +23,7 @@ jobs: php-version: - "8.3" operating-system: - - "blacksmith-4vcpu-ubuntu-2404" + - "blacksmith-2vcpu-ubuntu-2404" steps: - name: "Checkout" From 00ced000e7739df9aac6165d5a2735ec9170617f Mon Sep 17 00:00:00 2001 From: norberttech Date: Sat, 18 Jul 2026 13:33:11 +0000 Subject: [PATCH 7/7] ci: keep tests and mutation jobs on 4vcpu runners Those two jobs carry the heaviest load (job-tests stands up multiple service containers alongside PHPUnit; job-mutation-tests runs Infection with --threads=max), so keep them on blacksmith-4vcpu-ubuntu-2404 while the lighter workflows stay on the 2vcpu tier. Co-authored-by: Codesmith --- .github/actionlint.yaml | 1 + .github/workflows/job-mutation-tests.yml | 2 +- .github/workflows/job-tests.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index 400799b054..21d557da87 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -2,3 +2,4 @@ self-hosted-runner: # Blacksmith runner labels are custom labels actionlint does not know about. labels: - blacksmith-2vcpu-ubuntu-2404 + - blacksmith-4vcpu-ubuntu-2404 diff --git a/.github/workflows/job-mutation-tests.yml b/.github/workflows/job-mutation-tests.yml index cc06005a7c..ac2fcb397f 100644 --- a/.github/workflows/job-mutation-tests.yml +++ b/.github/workflows/job-mutation-tests.yml @@ -12,7 +12,7 @@ jobs: php-version: - "8.3" operating-system: - - "blacksmith-2vcpu-ubuntu-2404" + - "blacksmith-4vcpu-ubuntu-2404" steps: - name: "Checkout" diff --git a/.github/workflows/job-tests.yml b/.github/workflows/job-tests.yml index b64fa6736a..59fda798f9 100644 --- a/.github/workflows/job-tests.yml +++ b/.github/workflows/job-tests.yml @@ -54,7 +54,7 @@ jobs: - "8.4" - "8.5" operating-system: - - "blacksmith-2vcpu-ubuntu-2404" + - "blacksmith-4vcpu-ubuntu-2404" steps: - name: "Checkout"