From 8bc7f3597cab5d1191f0002985b2af3f17ac6b78 Mon Sep 17 00:00:00 2001
From: Richard Carillo <rcarillo@fastly.com>
Date: Tue, 28 Apr 2026 09:12:06 -0400
Subject: [PATCH 1/3] ci(go-releaser): add a test to ensure that tools PRs do
 not have any conflicts with go-releaser

---
 .github/workflows/pr_test.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index b2ab77ef1..fc04e86eb 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -127,6 +127,19 @@ jobs:
       - name: Build docker images
         run: |
           for dockerFile in Dockerfile*; do docker build -f $dockerFile . ; done
+  tools-build:
+    name: "Test goreleaser tools build"
+    if: contains(github.event.pull_request.labels.*.name, 'tools')
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v6
+      - name: "Install Go"
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: tools/go.mod
+      - name: "Test goreleaser tools build"
+        run: go tool -modfile=tools/go.mod goreleaser build --single-target --skip=post-hooks --skip=validate
   golangci-latest:
     name: lint-latest (informational)
     needs: [config]

From 7d6b7e45d3001ecc78eba38423a9002333d52b40 Mon Sep 17 00:00:00 2001
From: Richard Carillo <rcarillo@fastly.com>
Date: Tue, 28 Apr 2026 09:25:58 -0400
Subject: [PATCH 2/3] append '--snapshot' flag

---
 .github/workflows/pr_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index fc04e86eb..8798b70df 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -139,7 +139,7 @@ jobs:
         with:
           go-version-file: tools/go.mod
       - name: "Test goreleaser tools build"
-        run: go tool -modfile=tools/go.mod goreleaser build --single-target --skip=post-hooks --skip=validate
+        run: go tool -modfile=tools/go.mod goreleaser build --single-target --snapshot --skip=post-hooks --skip=validate
   golangci-latest:
     name: lint-latest (informational)
     needs: [config]

From 46ace792fc66cbbe626669934717295fc92d0ea2 Mon Sep 17 00:00:00 2001
From: Richard Carillo <rcarillo@fastly.com>
Date: Tue, 28 Apr 2026 09:33:11 -0400
Subject: [PATCH 3/3] ci: fix goreleaser tools build job to depend on config
 artifact

---
 .github/workflows/pr_test.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index 8798b70df..6b59a8331 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -128,8 +128,9 @@ jobs:
         run: |
           for dockerFile in Dockerfile*; do docker build -f $dockerFile . ; done
   tools-build:
-    name: "Test goreleaser tools build"
+    name: "goreleaser tools build"
     if: contains(github.event.pull_request.labels.*.name, 'tools')
+    needs: [config]
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout code"
@@ -138,6 +139,12 @@ jobs:
         uses: actions/setup-go@v6
         with:
           go-version-file: tools/go.mod
+      - name: "Config Artifact"
+        uses: actions/download-artifact@v8
+        with:
+          name: config-artifact-${{ github.sha }}
+      - name: "Move Config"
+        run: mv config.toml pkg/config/config.toml
       - name: "Test goreleaser tools build"
         run: go tool -modfile=tools/go.mod goreleaser build --single-target --snapshot --skip=post-hooks --skip=validate
   golangci-latest: