From 694fa32def8c7752ca58c91e631640183bed8dca Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Jan 2023 16:12:33 +0000
Subject: [PATCH 1/4] fix(deps): update github.com/bazelbuild/buildtools digest
 to 669c492

---
 go.mod | 2 +-
 go.sum | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 3341aaf7a..6e56a3eab 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/bazelbuild/bazel-gazelle v0.28.0
-	github.com/bazelbuild/buildtools v0.0.0-20221110131218-762712d8ce3f
+	github.com/bazelbuild/buildtools v0.0.0-20230103153053-669c4920306e
 	github.com/stretchr/testify v1.8.1
 )
 
diff --git a/go.sum b/go.sum
index b1147c9e9..ed37d0f79 100644
--- a/go.sum
+++ b/go.sum
@@ -4,6 +4,8 @@ github.com/bazelbuild/bazel-gazelle v0.28.0 h1:sPdMMujcMt5jeSLGFko5yF1XBD5MDqm6Y
 github.com/bazelbuild/bazel-gazelle v0.28.0/go.mod h1:5Qer6FCMBeotA8eQYJEPxn2eAbHmTApPxyd7aD4A0S8=
 github.com/bazelbuild/buildtools v0.0.0-20221110131218-762712d8ce3f h1:pkH5ds19YGNyq6CaDwioradmMA9XCMDhEN2jCgI8OF0=
 github.com/bazelbuild/buildtools v0.0.0-20221110131218-762712d8ce3f/go.mod h1:689QdV3hBP7Vo9dJMmzhoYIyo/9iMhEmHkJcnaPRCbo=
+github.com/bazelbuild/buildtools v0.0.0-20230103153053-669c4920306e h1:vtcpnkSZF7J3/YWAbaQWSQyFB+O4d7EUjuE9EBUrf/s=
+github.com/bazelbuild/buildtools v0.0.0-20230103153053-669c4920306e/go.mod h1:689QdV3hBP7Vo9dJMmzhoYIyo/9iMhEmHkJcnaPRCbo=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=

From 12ad0133382c6b823f0a128bbdd8241fb74494b4 Mon Sep 17 00:00:00 2001
From: Chuck Grindel <chuck@chuckgrindel.com>
Date: Tue, 3 Jan 2023 11:22:46 -0700
Subject: [PATCH 2/4] Ran tidy

---
 go.sum      | 2 --
 go_deps.bzl | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/go.sum b/go.sum
index ed37d0f79..ec05efb04 100644
--- a/go.sum
+++ b/go.sum
@@ -2,8 +2,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/bazelbuild/bazel-gazelle v0.28.0 h1:sPdMMujcMt5jeSLGFko5yF1XBD5MDqm6YeFoXx9ORm4=
 github.com/bazelbuild/bazel-gazelle v0.28.0/go.mod h1:5Qer6FCMBeotA8eQYJEPxn2eAbHmTApPxyd7aD4A0S8=
-github.com/bazelbuild/buildtools v0.0.0-20221110131218-762712d8ce3f h1:pkH5ds19YGNyq6CaDwioradmMA9XCMDhEN2jCgI8OF0=
-github.com/bazelbuild/buildtools v0.0.0-20221110131218-762712d8ce3f/go.mod h1:689QdV3hBP7Vo9dJMmzhoYIyo/9iMhEmHkJcnaPRCbo=
 github.com/bazelbuild/buildtools v0.0.0-20230103153053-669c4920306e h1:vtcpnkSZF7J3/YWAbaQWSQyFB+O4d7EUjuE9EBUrf/s=
 github.com/bazelbuild/buildtools v0.0.0-20230103153053-669c4920306e/go.mod h1:689QdV3hBP7Vo9dJMmzhoYIyo/9iMhEmHkJcnaPRCbo=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
diff --git a/go_deps.bzl b/go_deps.bzl
index 80c8d905a..94f277c57 100644
--- a/go_deps.bzl
+++ b/go_deps.bzl
@@ -23,8 +23,8 @@ def swift_bazel_go_dependencies():
         build_external = "external",
         build_naming_convention = "go_default_library",
         importpath = "github.com/bazelbuild/buildtools",
-        sum = "h1:pkH5ds19YGNyq6CaDwioradmMA9XCMDhEN2jCgI8OF0=",
-        version = "v0.0.0-20221110131218-762712d8ce3f",
+        sum = "h1:vtcpnkSZF7J3/YWAbaQWSQyFB+O4d7EUjuE9EBUrf/s=",
+        version = "v0.0.0-20230103153053-669c4920306e",
     )
     go_repository(
         name = "com_github_bazelbuild_rules_go",

From 336447aa2154f527860e431e13ce0e4faf7a377d Mon Sep 17 00:00:00 2001
From: Chuck Grindel <chuck.grindel@gmail.com>
Date: Tue, 3 Jan 2023 20:58:47 +0000
Subject: [PATCH 3/4] Be sure to set config to CI

---
 .github/workflows/ci.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a7e00751e..08cf8189a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,9 +13,15 @@ jobs:
     runs-on: macos-12
     steps:
     - uses: actions/checkout@v3
+    - name: Set config to CI
+      shell: bash
+      run: |
+        cat >> "local.bazelrc" <<EOF
+        common --common=ci
+        EOF
     - uses: cgrindel/gha_set_up_bazel@v1
       with:
-        repo_name: rules_spm
+        repo_name: swift_bazel
     - uses: ./.github/actions/build_and_test
 
   ubuntu_build:
@@ -41,9 +47,15 @@ jobs:
         # Need to expose the PATH so that the Swift toolchain can be found
         build --action_env=PATH
         EOF
+    - name: Set config to CI
+      shell: bash
+      run: |
+        cat >> "local.bazelrc" <<EOF
+        common --common=ci
+        EOF
     - uses: cgrindel/gha_set_up_bazel@v1
       with:
-        repo_name: rules_spm
+        repo_name: swift_bazel
     - uses: ./.github/actions/build_and_test
 
   all_ci_tests:

From a4f5ff45306c84ce5dbf316cebc62b40ac15ca03 Mon Sep 17 00:00:00 2001
From: Chuck Grindel <chuck.grindel@gmail.com>
Date: Tue, 3 Jan 2023 21:04:06 +0000
Subject: [PATCH 4/4] Fix typo

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 08cf8189a..dd68649a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       shell: bash
       run: |
         cat >> "local.bazelrc" <<EOF
-        common --common=ci
+        common --config=ci
         EOF
     - uses: cgrindel/gha_set_up_bazel@v1
       with:
@@ -51,7 +51,7 @@ jobs:
       shell: bash
       run: |
         cat >> "local.bazelrc" <<EOF
-        common --common=ci
+        common --config=ci
         EOF
     - uses: cgrindel/gha_set_up_bazel@v1
       with: