From 680e1770d9a5074e0c3ac740c49e13c520d4920f Mon Sep 17 00:00:00 2001 From: "Hermann D. Schimpf" Date: Tue, 16 Dec 2025 13:53:07 -0300 Subject: [PATCH 1/5] build: Use latest actions versions --- .github/workflows/build-zts.yml | 4 ++-- .github/workflows/verify-templating.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-zts.yml b/.github/workflows/build-zts.yml index c8dfc39cf7..3557546f4f 100644 --- a/.github/workflows/build-zts.yml +++ b/.github/workflows/build-zts.yml @@ -72,7 +72,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }} @@ -80,7 +80,7 @@ jobs: - name: Extract metadata id: meta - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: ghcr.io/${{ github.repository_owner }}/php-fpm-zts tags: | diff --git a/.github/workflows/verify-templating.yml b/.github/workflows/verify-templating.yml index e822ba6bb9..75c917479f 100644 --- a/.github/workflows/verify-templating.yml +++ b/.github/workflows/verify-templating.yml @@ -14,6 +14,6 @@ jobs: name: Check For Uncomitted Changes runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - run: ./apply-templates.sh - run: git diff --exit-code From 85f89ccb37ad60e1f854f0a6773c14f8b8adc9cc Mon Sep 17 00:00:00 2001 From: "Hermann D. Schimpf" Date: Tue, 16 Dec 2025 14:02:18 -0300 Subject: [PATCH 2/5] feat: Use blacksmith runners --- .github/workflows/build-zts.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-zts.yml b/.github/workflows/build-zts.yml index 3557546f4f..bc4ae26297 100644 --- a/.github/workflows/build-zts.yml +++ b/.github/workflows/build-zts.yml @@ -59,7 +59,7 @@ jobs: build-and-push: name: Build PHP v${{ matrix.version }} needs: generate-matrix - runs-on: ubuntu-latest + runs-on: blacksmith-2vcpu-ubuntu-2404 if: needs.generate-matrix.outputs.matrix != '{"include":[]}' strategy: fail-fast: false @@ -69,7 +69,7 @@ jobs: - uses: actions/checkout@v6 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: useblacksmith/setup-docker-builder@v1 - name: Log in to GitHub Container Registry uses: docker/login-action@v4 @@ -89,7 +89,7 @@ jobs: - name: Build and push Docker image id: build - uses: docker/build-push-action@v6 + uses: useblacksmith/build-push-action@v2 with: context: ./${{ matrix.directory }} push: true @@ -97,8 +97,6 @@ jobs: ghcr.io/${{ github.repository_owner }}/php-fpm-zts:${{ matrix.version }} ghcr.io/${{ github.repository_owner }}/php-fpm-zts:${{ matrix.patch }} labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max - name: Image digest run: echo ${{ steps.build.outputs.digest }} From ea3053ffdd3d30f765d6356ff85c6a0cd9745a1b Mon Sep 17 00:00:00 2001 From: "Hermann D. Schimpf" Date: Fri, 2 Jan 2026 10:40:10 -0300 Subject: [PATCH 3/5] build: Enable `feature/blacksmith` branch for testing --- .github/workflows/build-zts.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-zts.yml b/.github/workflows/build-zts.yml index bc4ae26297..b89d525e41 100644 --- a/.github/workflows/build-zts.yml +++ b/.github/workflows/build-zts.yml @@ -8,6 +8,7 @@ on: push: branches: - feature/zts + - feature/blacksmith permissions: contents: read From 1c0ae3e851dcce6e0c420fc7e053ec60507b51ac Mon Sep 17 00:00:00 2001 From: "Hermann D. Schimpf" Date: Mon, 6 Apr 2026 12:22:17 -0300 Subject: [PATCH 4/5] perf: Use 4vCPU as default --- .github/workflows/build-zts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-zts.yml b/.github/workflows/build-zts.yml index b89d525e41..9acc262d82 100644 --- a/.github/workflows/build-zts.yml +++ b/.github/workflows/build-zts.yml @@ -60,7 +60,7 @@ jobs: build-and-push: name: Build PHP v${{ matrix.version }} needs: generate-matrix - runs-on: blacksmith-2vcpu-ubuntu-2404 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: needs.generate-matrix.outputs.matrix != '{"include":[]}' strategy: fail-fast: false From b9d58e66999d44abd1ab6c0e0935dbd739fa5a07 Mon Sep 17 00:00:00 2001 From: "Hermann D. Schimpf" Date: Mon, 6 Apr 2026 12:27:03 -0300 Subject: [PATCH 5/5] Revert "build: Enable `feature/blacksmith` branch for testing" This reverts commit ea3053ffdd3d30f765d6356ff85c6a0cd9745a1b. --- .github/workflows/build-zts.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-zts.yml b/.github/workflows/build-zts.yml index 9acc262d82..79a3f59113 100644 --- a/.github/workflows/build-zts.yml +++ b/.github/workflows/build-zts.yml @@ -8,7 +8,6 @@ on: push: branches: - feature/zts - - feature/blacksmith permissions: contents: read