From 64e1febdac691542fc03f222b803499e22796109 Mon Sep 17 00:00:00 2001
From: Gus Cairo <gus.cairo@apple.com>
Date: Mon, 12 Aug 2024 17:04:24 +0100
Subject: [PATCH 1/3] Rename CI checkout directory from main to swift-protobuf

---
 .github/workflows/build.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 96af24b0b..f5f122b94 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        path: main
+        path: swift-protobuf
     - name: Update and install dependencies
       # dependencies from https://github.com/protocolbuffers/protobuf/blob/main/src/README.md
       # this step is run before get-sha because we need curl and jq for get-sha
@@ -62,10 +62,10 @@ jobs:
           ;;
         esac
     - name: Build
-      working-directory: main
+      working-directory: swift-protobuf
       run: make build ${{ matrix.swift.hook }}
     - name: Test runtime
-      working-directory: main
+      working-directory: swift-protobuf
       run: make test-runtime ${{ matrix.swift.hook }}
     - name: Cache protobuf
       id: cache-protobuf
@@ -97,16 +97,16 @@ jobs:
         NUM_CPUS=$(getconf _NPROCESSORS_ONLN)
         make -j "${NUM_CPUS}" protoc conformance_test_runner
     - name: Test plugin
-      working-directory: main
+      working-directory: swift-protobuf
       run: make test-plugin PROTOC=../protobuf/cmake_build/protoc
     - name: Test conformance
-      working-directory: main
+      working-directory: swift-protobuf
       run: make test-conformance CONFORMANCE_TEST_RUNNER=../protobuf/cmake_build/conformance_test_runner
     - name: Test SPM plugin
-      working-directory: main
+      working-directory: swift-protobuf
       run: make test-spm-plugin PROTOC=../protobuf/cmake_build/protoc
     - name: Compilation Tests
-      working-directory: main
+      working-directory: swift-protobuf
       run: make compile-tests PROTOC=../protobuf/cmake_build/protoc
 
   api-breakage:

From c8349c924ea26463d5dd50929516be1160e5abb3 Mon Sep 17 00:00:00 2001
From: Gus Cairo <gus.cairo@apple.com>
Date: Mon, 12 Aug 2024 17:04:29 +0100
Subject: [PATCH 2/3] Update tools version in PluginExamples Package.swift

---
 PluginExamples/Package.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PluginExamples/Package.swift b/PluginExamples/Package.swift
index bdae15376..6c4859566 100644
--- a/PluginExamples/Package.swift
+++ b/PluginExamples/Package.swift
@@ -1,11 +1,11 @@
-// swift-tools-version: 5.6
+// swift-tools-version: 5.8
 
 import PackageDescription
 
 let package = Package(
     name: "PluginExamples",
     dependencies: [
-        .package(name: "swift-protobuf", path: "../")
+        .package(path: "../")
     ],
     targets: [
         .testTarget(

From 8621ba00b3eef762c3dc1a97f6e7d7bf1db1f67f Mon Sep 17 00:00:00 2001
From: Gus Cairo <gus.cairo@apple.com>
Date: Mon, 12 Aug 2024 20:29:33 +0100
Subject: [PATCH 3/3] Change directory name in more jobs

---
 .github/workflows/check_upstream_protos.yml | 4 ++--
 .github/workflows/regular_conformance.yml   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check_upstream_protos.yml b/.github/workflows/check_upstream_protos.yml
index f56598c1e..fb2471c2c 100644
--- a/.github/workflows/check_upstream_protos.yml
+++ b/.github/workflows/check_upstream_protos.yml
@@ -14,12 +14,12 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        path: main
+        path: swift-protobuf
     - name: Checkout protobufbuffers/protobuf
       uses: actions/checkout@v4
       with:
         repository: protocolbuffers/protobuf
         path: protobuf
     - name: Check Upstream Proto Files
-      working-directory: main
+      working-directory: swift-protobuf
       run: make check-proto-files
diff --git a/.github/workflows/regular_conformance.yml b/.github/workflows/regular_conformance.yml
index f8973d338..8953db055 100644
--- a/.github/workflows/regular_conformance.yml
+++ b/.github/workflows/regular_conformance.yml
@@ -47,7 +47,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        path: main
+        path: swift-protobuf
     - name: Update and install dependencies
       # dependencies from https://github.com/protocolbuffers/protobuf/blob/main/src/README.md
       # this step is run before get-sha because we need curl and jq for get-sha
@@ -71,7 +71,7 @@ jobs:
       with:
         path: protobuf
         # NOTE: for refs that can float like 'main' the cache might be out of date!
-        key: ${{ runner.os }}-${{ matrix.swift}}-protobuf-${{ steps.get-sha.outputs.sha }}
+        key: ${{ runner.os }}-${{ matrix.swift }}-protobuf-${{ steps.get-sha.outputs.sha }}
     - name: Checkout protobuf repo
       if: steps.cache-protobuf.outputs.cache-hit != 'true'
       uses: actions/checkout@v4
@@ -95,5 +95,5 @@ jobs:
         NUM_CPUS=$(getconf _NPROCESSORS_ONLN)
         make -j "${NUM_CPUS}" protoc conformance_test_runner
     - name: Test conformance
-      working-directory: main
+      working-directory: swift-protobuf
       run: make test-conformance CONFORMANCE_TEST_RUNNER=../protobuf/cmake_build/conformance_test_runner