Update macOS runners to goldengate and drop Swift 6.1 testing

.github/workflows/cmake_build.yml

@@ -153,7 +153,7 @@ jobs:
   macos-build:
     name: "macOS (ARM64)"
     if: ${{ inputs.enable_macos_checks }}
-    runs-on: [self-hosted, macos, tahoe, ARM64]
+    runs-on: [self-hosted, macos, goldengate, ARM64]
     steps:
       - name: Checkout
         uses: actions/checkout@v7

.github/workflows/install_cmake_test.yml

@@ -83,7 +83,7 @@ jobs:
 
   macos:
     name: "macOS (ARM64)"
-    runs-on: [self-hosted, macos, tahoe, ARM64]
+    runs-on: [self-hosted, macos, goldengate, ARM64]
     steps:
       - name: Checkout
         uses: actions/checkout@v7

.github/workflows/package_test.yml

@@ -340,7 +340,7 @@ on:
       macos_os:
         type: string
         description: "macOS runner label, or a list of them (JSON/YAML array) to run one job per label."
-        default: "tahoe"
+        default: "goldengate"
       macos_arch:
         type: string
         description: "macOS runner architecture label."

.github/workflows/pull_request.yml

@@ -128,7 +128,7 @@ jobs:
           - runner: [ubuntu-latest]
             test: ./tests/runner-exit-code-tests.sh
             shell: bash
-          - runner: [self-hosted, macos, tahoe, ARM64]
+          - runner: [self-hosted, macos, goldengate, ARM64]
             test: ./tests/runner-exit-code-tests-macos.sh
             shell: bash
           - runner: [windows-latest]

.github/workflows/scripts/matrix/generate-matrix.swift

@@ -68,7 +68,7 @@ struct Configuration {
 
   @Input("MACOS_XCODE_VERSIONS") var macOSXcodeVersions: [String] = []
   @Input("MACOS_SWIFT_VERSIONS") var macOSVersions: [String] = []
-  @Input("MACOS_OS") var macOSOS: OSList = "tahoe"
+  @Input("MACOS_OS") var macOSOS: OSList = "goldengate"
   @Input("MACOS_ARCH") var macOSArchitecture = "ARM64"
   @Input("MACOS_RUNNER_POOL") var macOSPool = ""
   @Input("MACOS_COMMAND") var macOSCommands: Commands = "xcrun swift test"

.github/workflows/soundness.yml

@@ -54,7 +54,7 @@ on:
       docs_check_macos_version:
         type: string
         description: "macOS version for the macOS docs check job."
-        default: "tahoe"
+        default: "goldengate"
       docs_check_macos_arch:
         type: string
         description: "macOS arch for the macOS docs check job."

.github/workflows/swift_package_test.yml

@@ -9,23 +9,23 @@ on:
       macos_xcode_versions:
         type: string
         description: "Xcode version list (JSON)"
-        default: "[\"swift_6.1\", \"swift_6.2\", \"swift_6.3\", \"swift_6.4\"]"
+        default: "[\"swift_6.2\", \"swift_6.3\", \"swift_6.4\"]"
       macos_exclude_xcode_versions:
         type: string
         description: "Exclude Xcode version list (JSON)"
         default: "[{\"xcode_version\": \"\"}]"
       macos_versions:
         type: string
         description: "macOS version list (JSON)"
-        default: "[\"tahoe\"]"
+        default: "[\"goldengate\"]"
       macos_archs:
         type: string
         description: "macOS arch list (JSON)"
         default: "[\"ARM64\"]"
       macos_swiftly_toolchains:
         type: string
         description: "List of macOS Swiftly toolchain builds to test, each pairing an Xcode version with a Swiftly-managed Swift toolchain (JSON list of objects with xcode_version, swift_version, os_version, arch)"
-        default: "[{\"xcode_version\": \"swift_6.3\", \"swift_version\": \"main-snapshot\", \"os_version\": \"tahoe\", \"arch\": \"ARM64\"}]"
+        default: "[{\"xcode_version\": \"swift_6.3\", \"swift_version\": \"main-snapshot\", \"os_version\": \"goldengate\", \"arch\": \"ARM64\"}]"
       ios_host_xcode_versions:
         type: string
         description: "Xcode version list (JSON)"
@@ -45,7 +45,7 @@ on:
       linux_swift_versions:
         type: string
         description: "Include Linux Swift version list (JSON)"
-        default: "[ \"6.1\", \"6.2\", \"6.3\", \"6.4\", \"nightly-main\", \"nightly-6.4.x\"]"
+        default: "[ \"6.2\", \"6.3\", \"6.4\", \"nightly-main\", \"nightly-6.4.x\"]"
       linux_exclude_swift_versions:
         type: string
         description: "Exclude Linux Swift version list (JSON)"
@@ -86,7 +86,7 @@ on:
         type: string
         description: "Include Windows Swift version list (JSON)"
         # "5.10" is omitted for Windows because the container image is broken.
-        default: "[\"6.1\", \"6.2\", \"6.3\", \"6.4\", \"nightly-main\", \"nightly-6.4.x\"]"
+        default: "[\"6.2\", \"6.3\", \"6.4\", \"nightly-main\", \"nightly-6.4.x\"]"
       windows_exclude_swift_versions:
         type: string
         description: "Exclude Windows Swift version list (JSON)"
@@ -370,7 +370,9 @@ jobs:
               printf "%s\n" $i >> $GITHUB_ENV
             done
       - name: Select Xcode
-        run: echo "DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode_version }}.app/Contents/Developer" >> $GITHUB_ENV
+        run: |
+          echo "DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode_version }}.app/Contents/Developer" >> $GITHUB_ENV
+          echo "SDKROOT=${DEVELOPER_DIR}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" >> $GITHUB_ENV
       - name: Set up Swiftly environment
         run: |
           . "$HOME/.swiftly/env.sh"

.github/workflows/toolchain_matrix.yml

@@ -87,7 +87,7 @@ on:
       macos_os:
         type: string
         description: "macOS runner label, or a list of them (JSON/YAML array) to include one entry per label."
-        default: "tahoe"
+        default: "goldengate"
       macos_arch:
         type: string
         description: "macOS runner architecture label."

README.md

@@ -40,8 +40,8 @@ jobs:
 
 ### Testing
 
-To enable pull request testing for all supported Swift versions (5.9, 5.10,
-6.0, 6.1, 6.2, nightly, and nightly-6.3) on Linux and Windows, add the following code example in
+To enable pull request testing for all supported Swift versions (6.2, 6.3,
+6.4, nightly, and nightly-6.4.x) on Linux and Windows, add the following code example in
 `.github/workflows/pull_request.yml`:
 
 ```yaml

docs/soundness-docs-check.md

@@ -79,7 +79,7 @@ This enables the Linux documentation check along with the other soundness checks
 | Input | Type | Default | Description |
 |---|---|---|---|
 | `docs_check_macos_enabled` | boolean | `false` | Enable or disable the job. |
-| `docs_check_macos_version` | string | `tahoe` | macOS version label of the runner to target. |
+| `docs_check_macos_version` | string | `goldengate` | macOS version label of the runner to target. |
 | `docs_check_macos_arch` | string | `ARM64` | Architecture label of the runner to target. |
 | `docs_check_macos_xcode_version` | string | `26.0` | Xcode version to use. |
 | `docs_check_macos_targets` | string | `""` | Space-separated list of documentation targets to check. When empty, targets are read from `.spi.yml` (if present). |
@@ -98,7 +98,7 @@ jobs:
     uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
     with:
       docs_check_macos_enabled: true
-      docs_check_macos_version: "tahoe"
+      docs_check_macos_version: "goldengate"
       docs_check_macos_arch: "ARM64"
       docs_check_macos_xcode_version: "26.0"
 ```

tests/MatrixGeneratorValidator/Tests/MatrixGeneratorTests/CoreTests.swift

@@ -255,14 +255,14 @@ struct OSInputTests {
 
   @Test("A pool label is added to the runner labels only when one is given")
   func macOSPoolLabelIsOptional() throws {
-    let environment = ["ENABLE_MACOS": "true", "MACOS_SWIFT_VERSIONS": #"["6.3"]"#, "MACOS_OS": "tahoe"]
+    let environment = ["ENABLE_MACOS": "true", "MACOS_SWIFT_VERSIONS": #"["6.3"]"#, "MACOS_OS": "goldengate"]
     let without = try Generator.run(environment)
-    #expect(without.entries.first?.runner == ["self-hosted", "macos", "tahoe", "ARM64"])
+    #expect(without.entries.first?.runner == ["self-hosted", "macos", "goldengate", "ARM64"])
 
     var pooled = environment
     pooled["MACOS_RUNNER_POOL"] = "nightly"
     let with = try Generator.run(pooled)
-    #expect(with.entries.first?.runner == ["self-hosted", "macos", "tahoe", "ARM64", "nightly"])
+    #expect(with.entries.first?.runner == ["self-hosted", "macos", "goldengate", "ARM64", "nightly"])
   }
 }
 

tests/MatrixGeneratorValidator/Tests/MatrixGeneratorTests/PlatformTests.swift

@@ -229,7 +229,7 @@ struct MacOSTests {
     #expect(generated.count == 2)
     for entry in generated.entries {
       #expect(entry.runner.contains("sequoia"), "\(entry.name) ignored macos_os")
-      #expect(!entry.runner.contains("tahoe"), "\(entry.name) used the default OS")
+      #expect(!entry.runner.contains("goldengate"), "\(entry.name) used the default OS")
     }
 
     // An entry naming its own OS still wins over the list.
@@ -249,25 +249,25 @@ struct MacOSTests {
     // leaves the rest of the list with no swiftly coverage at all.
     let generated = try Generator.run([
       "ENABLE_MACOS_SWIFTLY": "true",
-      "MACOS_OS": #"["sequoia","tahoe"]"#,
+      "MACOS_OS": #"["sequoia","goldengate"]"#,
       "MACOS_SWIFTLY_TOOLCHAINS":
         #"[{"xcode_version":"swift_6.3","swiftly_toolchain":"main-snapshot"}]"#,
     ])
     try #require(generated.count == 2)
     #expect(
       generated.names == [
         "macOS Swiftly main-snapshot (Xcode swift_6.3) sequoia",
-        "macOS Swiftly main-snapshot (Xcode swift_6.3) tahoe",
+        "macOS Swiftly main-snapshot (Xcode swift_6.3) goldengate",
       ]
     )
     #expect(generated.entries[0].runner.contains("sequoia"))
-    #expect(generated.entries[1].runner.contains("tahoe"))
+    #expect(generated.entries[1].runner.contains("goldengate"))
 
     // An entry naming its own OS runs there alone. Fanning it out as well would
     // give one entry per configured OS, all on the pinned one and all named alike.
     let pinned = try Generator.run([
       "ENABLE_MACOS_SWIFTLY": "true",
-      "MACOS_OS": #"["sequoia","tahoe"]"#,
+      "MACOS_OS": #"["sequoia","goldengate"]"#,
       "MACOS_SWIFTLY_TOOLCHAINS": """
       [{"xcode_version":"swift_6.3","swiftly_toolchain":"main-snapshot","os_version":"sonoma"},\
       {"xcode_version":"swift_6.2","swiftly_toolchain":"6.2-snapshot"}]
@@ -278,7 +278,7 @@ struct MacOSTests {
       pinned.names == [
         "macOS Swiftly main-snapshot (Xcode swift_6.3) sonoma",
         "macOS Swiftly 6.2-snapshot (Xcode swift_6.2) sequoia",
-        "macOS Swiftly 6.2-snapshot (Xcode swift_6.2) tahoe",
+        "macOS Swiftly 6.2-snapshot (Xcode swift_6.2) goldengate",
       ]
     )
   }
@@ -304,7 +304,7 @@ struct MacOSTests {
     #expect(try names("sequoia") == bare)
     #expect(try names(#"["sequoia"]"#) == bare)
     // Without this the names above would be stable because nothing fans out.
-    #expect(try names(#"["sequoia","tahoe"]"#).count == 2)
+    #expect(try names(#"["sequoia","goldengate"]"#).count == 2)
   }
 }