From 0472150f35227f16795bef7f657b85d3c2c1e2ee Mon Sep 17 00:00:00 2001
From: Bassam Khouri <bkhouri@apple.com>
Date: Fri, 5 Dec 2025 00:34:26 -0500
Subject: [PATCH 1/3] GHA: Enable testing

Instead of only building the tests, execute them as well.  Also run against
swiftbuild backend.

Fixes: #9427
Issue: rdar://165491718
---
 .github/workflows/pull_request.yml | 32 ++++++++++++++++++++----------
 Utilities/build-using-self         |  2 +-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 7d1335f4e39..59d2f2454d5 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -12,11 +12,12 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  tests-using-native:
+  tests:
     needs: [soundness]
     strategy:
       fail-fast: false
       matrix:
+        executableTargetBuildSystem: ["native"]
         buildSystem: ["native", "swiftbuild"]
         linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]']
         enable_windows_checks: [true]
@@ -27,39 +28,46 @@ jobs:
             enable_windows_checks: true
           - buildSystem: "native"
             linuxSwiftVersion: '["nightly-main"]'
-    name: Test (${{ matrix.buildSystem }})
+    name: Test (${{ matrix.buildSystem }}) (exectable target built using ${{ matrix.executableTargetBuildSystem }})
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
     with:
       linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
       linux_swift_versions: ${{ matrix.linuxSwiftVersion }}
       linux_pre_build_command: ./.github/scripts/prebuild.sh
-      linux_build_command: 'swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}'
+      linux_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
       windows_swift_versions: '["nightly-main"]'
       windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
-      windows_build_command: 'Invoke-Program swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}'
+      windows_build_command: 'Invoke-Program swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} -Xlinker /ignore:4217 swift-test -Xlinker /ignore:4217 --parallel --build-system ${{ matrix.buildSystem}}'
       enable_windows_checks: ${{ matrix.enable_windows_checks }}
       enable_ios_checks: true
       enable_macos_checks: true
       macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
-      macos_build_command: 'swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}'
+      macos_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
+      ios_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'
 
-  tests-using-swiftbuild:
-    name: Test (all SwiftBuild)
+  build-using-swiftbuild:
+    strategy:
+      fail-fast: false
+      matrix:
+        executableTargetBuildSystem: ["swiftbuild"]
+        buildSystem: ["swiftbuild"]
+    name: Build (${{ matrix.buildSystem }}) (exectable target built using ${{ matrix.executableTargetBuildSystem }})
     needs: [soundness]
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
     with:
       linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
       linux_swift_versions: '["nightly-main"]'
       linux_pre_build_command: ./.github/scripts/prebuild.sh
-      linux_build_command: 'swift run --build-system swiftbuild swift-build --build-tests --build-system swiftbuild'
+      linux_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests --build-system ${{ matrix.buildSystem }}'
       enable_windows_checks: false
       windows_swift_versions: '["nightly-main"]'
       windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
-      windows_build_command: 'Invoke-Program swift run --build-system swiftbuild swift-build --build-tests --build-system swiftbuild'
+      windows_build_command: 'Invoke-Program swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests --build-system ${{ matrix.buildSystem }}'
       enable_ios_checks: true
       enable_macos_checks: true
       macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
-      macos_build_command: 'swift run --build-system swiftbuild swift-build --build-tests --build-system swiftbuild'
+      macos_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests --build-system ${{ matrix.buildSystem }}'
+      ios_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests --build-system ${{ matrix.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'
 
   soundness:
     name: Soundness
@@ -71,3 +79,7 @@ jobs:
       api_breakage_check_enabled: false
       format_check_enabled: false
       shell_check_enabled: false
+      docs_check_enabled: true
+      broken_symlink_check_enabled: true
+      python_lint_check_enabled: true
+      yamllint_check_enabled: true
diff --git a/Utilities/build-using-self b/Utilities/build-using-self
index 3370a64637c..18ef8a76d3f 100755
--- a/Utilities/build-using-self
+++ b/Utilities/build-using-self
@@ -301,7 +301,7 @@ def main() -> None:
                     *args.additional_run_args.split(" "),
                     "swift-test",
                     *global_args,
-                    "--vv",
+                    # "--vv",
                     "--force-resolved-versions",
                     "--parallel",
                     "--scratch-path",

From 33b3f73c6bed37da04a5af76bd8600b031c7c49a Mon Sep 17 00:00:00 2001
From: Bassam Khouri <bkhouri@apple.com>
Date: Fri, 19 Dec 2025 20:31:29 -0500
Subject: [PATCH 2/3] try something different

---
 .github/workflows/pull_request.yml | 90 ++++++++++++++++++++----------
 .github/workflows/swift_test.yml   | 40 +++++++++++++
 2 files changed, 99 insertions(+), 31 deletions(-)
 create mode 100644 .github/workflows/swift_test.yml

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 59d2f2454d5..e6507b76efc 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -12,38 +12,66 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  tests:
+  tests-native:
     needs: [soundness]
-    strategy:
-      fail-fast: false
-      matrix:
-        executableTargetBuildSystem: ["native"]
-        buildSystem: ["native", "swiftbuild"]
-        linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]']
-        enable_windows_checks: [true]
-        exclude:
-          - buildSystem: "swiftbuild"
-            linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
-          - buildSystem: "swiftbuild"
-            enable_windows_checks: true
-          - buildSystem: "native"
-            linuxSwiftVersion: '["nightly-main"]'
-    name: Test (${{ matrix.buildSystem }}) (exectable target built using ${{ matrix.executableTargetBuildSystem }})
-    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
-    with:
-      linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
-      linux_swift_versions: ${{ matrix.linuxSwiftVersion }}
-      linux_pre_build_command: ./.github/scripts/prebuild.sh
-      linux_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
-      windows_swift_versions: '["nightly-main"]'
-      windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
-      windows_build_command: 'Invoke-Program swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} -Xlinker /ignore:4217 swift-test -Xlinker /ignore:4217 --parallel --build-system ${{ matrix.buildSystem}}'
-      enable_windows_checks: ${{ matrix.enable_windows_checks }}
-      enable_ios_checks: true
-      enable_macos_checks: true
-      macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
-      macos_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
-      ios_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Tests
+        uses: ./.github/workflows/swift_test.yaml
+        with:
+          buildSystem: native
+          executableTargetBuildSystem: native
+          linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
+          enableWindowsChecks: true
+
+  tests-swiftbuild:
+    needs: [soundness]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Tests
+        uses: ./.github/workflows/swift_test.yaml
+        with:
+          buildSystem: swiftbuild
+          executableTargetBuildSystem: native
+          linuxSwiftVersion: '["nightly-main"]'
+          enableWindowsChecks: true
+
+  # tests:
+  #   needs: [soundness]
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       executableTargetBuildSystem: ["native"]
+  #       buildSystem: ["native", "swiftbuild"]
+  #       linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]']
+  #       enable_windows_checks: [true]
+  #       exclude:
+  #         - buildSystem: "swiftbuild"
+  #           linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
+  #         - buildSystem: "swiftbuild"
+  #           enable_windows_checks: true
+  #         - buildSystem: "native"
+  #           linuxSwiftVersion: '["nightly-main"]'
+  #   name: Test (${{ matrix.buildSystem }}) (exectable target built using ${{ matrix.executableTargetBuildSystem }})
+  #   uses: swiftlang/swift-package-manager/.github/workflows/swift_test.yml@0.0.2
+  #   with:
+  #     linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
+  #     linux_swift_versions: ${{ matrix.linuxSwiftVersion }}
+  #     linux_pre_build_command: ./.github/scripts/prebuild.sh
+  #     linux_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
+  #     windows_swift_versions: '["nightly-main"]'
+  #     windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
+  #     windows_build_command: 'Invoke-Program swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} -Xlinker /ignore:4217 swift-test -Xlinker /ignore:4217 --parallel --build-system ${{ matrix.buildSystem}}'
+  #     enable_windows_checks: ${{ matrix.enable_windows_checks }}
+  #     enable_ios_checks: true
+  #     enable_macos_checks: true
+  #     macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
+  #     macos_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
+  #     ios_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'
 
   build-using-swiftbuild:
     strategy:
diff --git a/.github/workflows/swift_test.yml b/.github/workflows/swift_test.yml
new file mode 100644
index 00000000000..c5420308b15
--- /dev/null
+++ b/.github/workflows/swift_test.yml
@@ -0,0 +1,40 @@
+name: SwiftPM Test Matrix
+
+permissions:
+  contents: read
+
+on:
+  workflow_call:
+    inputs:
+      buildSystem:
+        type: string
+        required: true
+      executableTargetBuildSystem:
+        type: string
+        required: true
+      linuxSwiftVersion:
+        type: string
+        required: true
+      enableWindowsChecks:
+        type: boolean
+        required: true
+
+jobs:
+
+  matrix-test:
+    name: Test (${{ inputs.buildSystem }}) (exectable target built using ${{ inputs.executableTargetBuildSystem }})
+    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
+    with:
+      linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
+      linux_swift_versions: ${{ inputs.linuxSwiftVersion }}
+      linux_pre_build_command: ./.github/scripts/prebuild.sh
+      linux_build_command: 'swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ inputs.buildSystem}}'
+      windows_swift_versions: '["nightly-main"]'
+      windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
+      windows_build_command: 'Invoke-Program swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ inputs.executableTargetBuildSystem }} -Xlinker /ignore:4217 swift-test -Xlinker /ignore:4217 --parallel --build-system ${{ inputs.buildSystem}}'
+      enable_windows_checks: ${{ inputs.enableWindowsChecks }}
+      enable_ios_checks: true
+      enable_macos_checks: true
+      macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
+      macos_build_command: 'swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ inputs.buildSystem}}'
+      ios_build_command: 'swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ inputs.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'

From 06be133f60942c4b557843cac6fd5451364ccb9e Mon Sep 17 00:00:00 2001
From: Bassam Khouri <bkhouri@apple.com>
Date: Fri, 19 Dec 2025 21:04:04 -0500
Subject: [PATCH 3/3] Revert "try something different"

This reverts commit 33b3f73c6bed37da04a5af76bd8600b031c7c49a.
---
 .github/workflows/pull_request.yml | 90 ++++++++++--------------------
 .github/workflows/swift_test.yml   | 40 -------------
 2 files changed, 31 insertions(+), 99 deletions(-)
 delete mode 100644 .github/workflows/swift_test.yml

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index e6507b76efc..59d2f2454d5 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -12,66 +12,38 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  tests-native:
+  tests:
     needs: [soundness]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Tests
-        uses: ./.github/workflows/swift_test.yaml
-        with:
-          buildSystem: native
-          executableTargetBuildSystem: native
-          linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
-          enableWindowsChecks: true
-
-  tests-swiftbuild:
-    needs: [soundness]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Tests
-        uses: ./.github/workflows/swift_test.yaml
-        with:
-          buildSystem: swiftbuild
-          executableTargetBuildSystem: native
-          linuxSwiftVersion: '["nightly-main"]'
-          enableWindowsChecks: true
-
-  # tests:
-  #   needs: [soundness]
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       executableTargetBuildSystem: ["native"]
-  #       buildSystem: ["native", "swiftbuild"]
-  #       linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]']
-  #       enable_windows_checks: [true]
-  #       exclude:
-  #         - buildSystem: "swiftbuild"
-  #           linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
-  #         - buildSystem: "swiftbuild"
-  #           enable_windows_checks: true
-  #         - buildSystem: "native"
-  #           linuxSwiftVersion: '["nightly-main"]'
-  #   name: Test (${{ matrix.buildSystem }}) (exectable target built using ${{ matrix.executableTargetBuildSystem }})
-  #   uses: swiftlang/swift-package-manager/.github/workflows/swift_test.yml@0.0.2
-  #   with:
-  #     linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
-  #     linux_swift_versions: ${{ matrix.linuxSwiftVersion }}
-  #     linux_pre_build_command: ./.github/scripts/prebuild.sh
-  #     linux_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
-  #     windows_swift_versions: '["nightly-main"]'
-  #     windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
-  #     windows_build_command: 'Invoke-Program swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} -Xlinker /ignore:4217 swift-test -Xlinker /ignore:4217 --parallel --build-system ${{ matrix.buildSystem}}'
-  #     enable_windows_checks: ${{ matrix.enable_windows_checks }}
-  #     enable_ios_checks: true
-  #     enable_macos_checks: true
-  #     macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
-  #     macos_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
-  #     ios_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'
+    strategy:
+      fail-fast: false
+      matrix:
+        executableTargetBuildSystem: ["native"]
+        buildSystem: ["native", "swiftbuild"]
+        linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]']
+        enable_windows_checks: [true]
+        exclude:
+          - buildSystem: "swiftbuild"
+            linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
+          - buildSystem: "swiftbuild"
+            enable_windows_checks: true
+          - buildSystem: "native"
+            linuxSwiftVersion: '["nightly-main"]'
+    name: Test (${{ matrix.buildSystem }}) (exectable target built using ${{ matrix.executableTargetBuildSystem }})
+    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
+    with:
+      linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
+      linux_swift_versions: ${{ matrix.linuxSwiftVersion }}
+      linux_pre_build_command: ./.github/scripts/prebuild.sh
+      linux_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
+      windows_swift_versions: '["nightly-main"]'
+      windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
+      windows_build_command: 'Invoke-Program swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} -Xlinker /ignore:4217 swift-test -Xlinker /ignore:4217 --parallel --build-system ${{ matrix.buildSystem}}'
+      enable_windows_checks: ${{ matrix.enable_windows_checks }}
+      enable_ios_checks: true
+      enable_macos_checks: true
+      macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
+      macos_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
+      ios_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'
 
   build-using-swiftbuild:
     strategy:
diff --git a/.github/workflows/swift_test.yml b/.github/workflows/swift_test.yml
deleted file mode 100644
index c5420308b15..00000000000
--- a/.github/workflows/swift_test.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: SwiftPM Test Matrix
-
-permissions:
-  contents: read
-
-on:
-  workflow_call:
-    inputs:
-      buildSystem:
-        type: string
-        required: true
-      executableTargetBuildSystem:
-        type: string
-        required: true
-      linuxSwiftVersion:
-        type: string
-        required: true
-      enableWindowsChecks:
-        type: boolean
-        required: true
-
-jobs:
-
-  matrix-test:
-    name: Test (${{ inputs.buildSystem }}) (exectable target built using ${{ inputs.executableTargetBuildSystem }})
-    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
-    with:
-      linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
-      linux_swift_versions: ${{ inputs.linuxSwiftVersion }}
-      linux_pre_build_command: ./.github/scripts/prebuild.sh
-      linux_build_command: 'swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ inputs.buildSystem}}'
-      windows_swift_versions: '["nightly-main"]'
-      windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
-      windows_build_command: 'Invoke-Program swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ inputs.executableTargetBuildSystem }} -Xlinker /ignore:4217 swift-test -Xlinker /ignore:4217 --parallel --build-system ${{ inputs.buildSystem}}'
-      enable_windows_checks: ${{ inputs.enableWindowsChecks }}
-      enable_ios_checks: true
-      enable_macos_checks: true
-      macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
-      macos_build_command: 'swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ inputs.buildSystem}}'
-      ios_build_command: 'swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ inputs.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'