Merge branch 'main' into jadams/retry-curl

justice-adams-apple · web-flow · commit df97225fee1a · 2025-12-04T08:48:25.000-08:00
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -17,9 +17,7 @@ jobs:
       enable_macos_checks: false
       enable_windows_checks: false
       wasm_sdk_pre_build_command: |
-        mkdir MyPackage
-        cd MyPackage
-        swift package init --type library
+        cd tests/TestPackage
       enable_embedded_wasm_sdk_build: true
 
   tests_with_docker:
@@ -29,32 +27,22 @@ jobs:
       # Linux
       linux_os_versions: '["jammy", "rhel-ubi9", "amazonlinux2"]'
       linux_build_command: |
-        mkdir MyPackage
-        cd MyPackage
-        swift package init --type library
+        cd tests/TestPackage
         swift build
       linux_static_sdk_pre_build_command: |
-        mkdir MyPackage
-        cd MyPackage
-        swift package init --type library
+        cd tests/TestPackage
       enable_linux_static_sdk_build: true
       # Wasm
       wasm_sdk_pre_build_command: |
-        mkdir MyPackage
-        cd MyPackage
-        swift package init --type library
+        cd tests/TestPackage
       enable_wasm_sdk_build: true
       # Android
       android_sdk_pre_build_command: |
-        mkdir MyPackage
-        cd MyPackage
-        swift package init --type library
+        cd tests/TestPackage
       enable_android_sdk_build: true
       # Windows
       windows_build_command: |
-        mkdir MyPackage
-        cd MyPackage
-        Invoke-Program swift package init --type library
+        cd tests/TestPackage
         Invoke-Program swift build
       enable_windows_docker: true
 
@@ -66,17 +54,14 @@ jobs:
       enable_linux_checks: false
       # Android
       android_sdk_pre_build_command: |
-        mkdir MyPackage
-        cd MyPackage
-        swift package init --type library
+        cd tests/TestPackage
       enable_android_sdk_build: true
       # Windows
       windows_build_command: |
-        mkdir MyPackage
-        cd MyPackage
-        Invoke-Program swift package init --type library
+        cd tests/TestPackage
         Invoke-Program swift build
       enable_windows_docker: false
+      windows_os_versions: '["windows-2022", "windows-11-arm"]'
 
   tests_macos:
     name: Test
@@ -87,9 +72,7 @@ jobs:
       # macOS
       enable_macos_checks: true
       macos_build_command: |
-        mkdir MyPackage
-        cd MyPackage
-        xcrun swift package init --type library
+        cd tests/TestPackage
         xcrun swift build
 
   build_tests_ios:
@@ -100,9 +83,9 @@ jobs:
       enable_windows_checks: false
       # iOS
       enable_ios_checks: true
-      ios_pre_build_command: |
-        pwd
-        xcrun swift package init --type library
+      ios_build_command: |
+        cd tests/TestPackage
+        xcodebuild -quiet -scheme TestPackage-Package -destination "generic/platform=ios" build
 
   soundness:
     name: Soundness
diff --git a/.github/workflows/scripts/windows/install-vsb.ps1 b/.github/workflows/scripts/windows/install-vsb.ps1
@@ -131,7 +131,8 @@ function Install-VisualStudioBuildTools {
             '--norestart',
             '--nocache',
             '--add', 'Microsoft.VisualStudio.Component.Windows11SDK.22000',
-            '--add', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64'
+            '--add', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
+            '--add', 'Microsoft.VisualStudio.Component.VC.Tools.ARM64'
         )
         if ($Process.ExitCode -eq 0 -or $Process.ExitCode -eq 3010) {
             Write-Host 'SUCCESS'
diff --git a/.github/workflows/scripts/windows/swift/install-swift-6.0.ps1 b/.github/workflows/scripts/windows/swift/install-swift-6.0.ps1
@@ -11,7 +11,12 @@
 ##===----------------------------------------------------------------------===##
 . $PSScriptRoot\install-swift.ps1
 
-$SWIFT='https://download.swift.org/swift-6.0.3-release/windows10/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-windows10.exe'
-$SWIFT_SHA256='AB205D83A38047882DB80E6A88C7D33B651F3BAC96D4515D7CBA5335F37999D3'
+if ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture -eq "Arm64") {
+    $SWIFT='https://download.swift.org/swift-6.0.3-release/windows10-arm64/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-windows10-arm64.exe'
+    $SWIFT_SHA256='81474651e59a9955c9e6a389ef53abd61631ffc62c63a2a02977271019e7c722'
+} else {
+    $SWIFT='https://download.swift.org/swift-6.0.3-release/windows10/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-windows10.exe'
+    $SWIFT_SHA256='AB205D83A38047882DB80E6A88C7D33B651F3BAC96D4515D7CBA5335F37999D3'
+}
 
 Install-Swift -Url $SWIFT -Sha256 $SWIFT_SHA256
diff --git a/.github/workflows/scripts/windows/swift/install-swift-6.1.ps1 b/.github/workflows/scripts/windows/swift/install-swift-6.1.ps1
@@ -11,7 +11,12 @@
 ##===----------------------------------------------------------------------===##
 . $PSScriptRoot\install-swift.ps1
 
-$SWIFT='https://download.swift.org/swift-6.1.2-release/windows10/swift-6.1.2-RELEASE/swift-6.1.2-RELEASE-windows10.exe'
-$SWIFT_SHA256='92a0323ed7dd333c3b05e6e0e428f3a91c77d159f6ccfc8626a996f2ace09a0b'
+if ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture -eq "Arm64") {
+    $SWIFT='https://download.swift.org/swift-6.1.2-release/windows10-arm64/swift-6.1.2-RELEASE/swift-6.1.2-RELEASE-windows10-arm64.exe'
+    $SWIFT_SHA256='121fb407e578178f82dccf39a4d03527873d8f7611a801a8fc26da52503a0c5c'
+} else {
+    $SWIFT='https://download.swift.org/swift-6.1.2-release/windows10/swift-6.1.2-RELEASE/swift-6.1.2-RELEASE-windows10.exe'
+    $SWIFT_SHA256='92a0323ed7dd333c3b05e6e0e428f3a91c77d159f6ccfc8626a996f2ace09a0b'
+}
 
 Install-Swift -Url $SWIFT -Sha256 $SWIFT_SHA256
diff --git a/.github/workflows/scripts/windows/swift/install-swift-6.2.ps1 b/.github/workflows/scripts/windows/swift/install-swift-6.2.ps1
@@ -11,7 +11,12 @@
 ##===----------------------------------------------------------------------===##
 . $PSScriptRoot\install-swift.ps1
 
-$SWIFT='https://download.swift.org/swift-6.2.1-release/windows10/swift-6.2.1-RELEASE/swift-6.2.1-RELEASE-windows10.exe'
-$SWIFT_SHA256='FD1209AC3E008152924E0409E5590F2FE41644132E532D4526B8641339E88000'
+if ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture -eq "Arm64") {
+    $SWIFT='https://download.swift.org/swift-6.2.1-release/windows10-arm64/swift-6.2.1-RELEASE/swift-6.2.1-RELEASE-windows10-arm64.exe'
+    $SWIFT_SHA256='7c2351e1708f6e74f4c97098c50ac049e08a58894e75cc7c8fd220eb2549fb9d'
+} else {
+    $SWIFT='https://download.swift.org/swift-6.2.1-release/windows10/swift-6.2.1-RELEASE/swift-6.2.1-RELEASE-windows10.exe'
+    $SWIFT_SHA256='FD1209AC3E008152924E0409E5590F2FE41644132E532D4526B8641339E88000'
+}
 
 Install-Swift -Url $SWIFT -Sha256 $SWIFT_SHA256
diff --git a/.github/workflows/scripts/windows/swift/install-swift-nightly-6.2.ps1 b/.github/workflows/scripts/windows/swift/install-swift-nightly-6.2.ps1
@@ -11,8 +11,14 @@
 ##===----------------------------------------------------------------------===##
 . $PSScriptRoot\install-swift.ps1
 
-$SWIFT_RELEASE_METADATA='http://download.swift.org/swift-6.2-branch/windows10/latest-build.json'
+if ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture -eq "Arm64") {
+    $swiftOSVersion = 'windows10-arm64'
+} else {
+    $swiftOSVersion = 'windows10'
+}
+
+$SWIFT_RELEASE_METADATA="https://download.swift.org/swift-6.2-branch/$swiftOSVersion/latest-build.json"
 $Release = curl.exe -sL ${SWIFT_RELEASE_METADATA}
-$SWIFT_URL = "https://download.swift.org/swift-6.2-branch/windows10/$($($Release | ConvertFrom-JSON).dir)/$($($Release | ConvertFrom-JSON).download)"
+$SWIFT_URL = "https://download.swift.org/swift-6.2-branch/$swiftOSVersion/$($($Release | ConvertFrom-JSON).dir)/$($($Release | ConvertFrom-JSON).download)"
 
 Install-Swift -Url $SWIFT_URL -Sha256 ""
diff --git a/.github/workflows/scripts/windows/swift/install-swift-nightly.ps1 b/.github/workflows/scripts/windows/swift/install-swift-nightly.ps1
@@ -11,8 +11,14 @@
 ##===----------------------------------------------------------------------===##
 . $PSScriptRoot\install-swift.ps1
 
-$SWIFT_RELEASE_METADATA='http://download.swift.org/development/windows10/latest-build.json'
+if ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture -eq "Arm64") {
+    $swiftOSVersion = 'windows10-arm64'
+} else {
+    $swiftOSVersion = 'windows10'
+}
+
+$SWIFT_RELEASE_METADATA="https://download.swift.org/development/$swiftOSVersion/latest-build.json"
 $Release = curl.exe -sL ${SWIFT_RELEASE_METADATA}
-$SWIFT_URL = "https://download.swift.org/development/windows10/$($($Release | ConvertFrom-JSON).dir)/$($($Release | ConvertFrom-JSON).download)"
+$SWIFT_URL = "https://download.swift.org/development/$swiftOSVersion/$($($Release | ConvertFrom-JSON).dir)/$($($Release | ConvertFrom-JSON).download)"
 
 Install-Swift -Url $SWIFT_URL -Sha256 ""
diff --git a/.github/workflows/swift_package_test.yml b/.github/workflows/swift_package_test.yml
@@ -83,6 +83,10 @@ on:
         type: string
         description: "Exclude Windows Swift version list (JSON)"
         default: "[{\"swift_version\": \"\"}]"
+      windows_os_versions:
+        type: string
+        description: "Windows OS version label list (JSON)"
+        default: "[\"windows-2022\"]"
       swift_flags:
         type: string
         description: "Swift flags for release version"
@@ -618,13 +622,14 @@ jobs:
           ${{ steps.script_path.outputs.root }}/.github/workflows/scripts/install-and-build-with-sdk.sh --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-triple=${{ join(fromJson(inputs.android_sdk_triples), ' --android-sdk-triple=') }} --android-ndk-version="${{ matrix.ndk_version }}" ${{ matrix.swift_version }}
 
   windows-build:
-    name: Windows (${{ matrix.swift_version }} - windows-2022)
+    name: Windows (${{ matrix.swift_version }} - ${{ matrix.os_version }})
     if: ${{ inputs.enable_windows_checks }}
-    runs-on: windows-2022
+    runs-on: ${{ matrix.os_version }}
     strategy:
       fail-fast: false
       matrix:
         swift_version: ${{ fromJson(inputs.windows_swift_versions) }}
+        os_version: ${{ fromJson(inputs.windows_os_versions) }}
         exclude:
           - ${{ fromJson(inputs.windows_exclude_swift_versions) }}
     steps:
diff --git a/.licenseignore b/.licenseignore
@@ -3,3 +3,5 @@
 CODEOWNERS
 LICENSE.txt
 README.md
+**/Package.swift
+**/Package@swift-*
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ on:
 jobs:
   soundness:
     name: Soundness
-    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
+    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@0.0.1
     with:
       license_header_check_project_name: "Swift.org"
 ```
@@ -54,7 +54,7 @@ on:
 jobs:
   tests:
     name: tests
-    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
+    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.1
 ```
 
 If your package only supports newer compiler versions, you can exclude older
diff --git a/tests/TestPackage/Package.swift b/tests/TestPackage/Package.swift
@@ -0,0 +1,22 @@
+// swift-tools-version: 6.1
+
+import PackageDescription
+
+let package = Package(
+  name: "TestPackage",
+  targets: [
+    .target(
+      name: "Target1"
+    ),
+    .target(
+      name: "Target2",
+      dependencies: [
+        "Target1"
+      ]
+    ),
+    .testTarget(
+      name: "Target1Tests",
+      dependencies: ["Target1"]
+    ),
+  ]
+)
diff --git a/tests/TestPackage/Package@swift-5.10.swift b/tests/TestPackage/Package@swift-5.10.swift
@@ -0,0 +1,22 @@
+// swift-tools-version: 5.10
+
+import PackageDescription
+
+let package = Package(
+  name: "TestPackage",
+  targets: [
+    .target(
+      name: "Target1"
+    ),
+    .target(
+      name: "Target2",
+      dependencies: [
+        "Target1"
+      ]
+    ),
+    .testTarget(
+      name: "Target1Tests",
+      dependencies: ["Target1"]
+    ),
+  ]
+)
diff --git a/tests/TestPackage/Package@swift-5.9.swift b/tests/TestPackage/Package@swift-5.9.swift
@@ -0,0 +1,22 @@
+// swift-tools-version: 5.9
+
+import PackageDescription
+
+let package = Package(
+  name: "TestPackage",
+  targets: [
+    .target(
+      name: "Target1"
+    ),
+    .target(
+      name: "Target2",
+      dependencies: [
+        "Target1"
+      ]
+    ),
+    .testTarget(
+      name: "Target1Tests",
+      dependencies: ["Target1"]
+    ),
+  ]
+)
diff --git a/tests/TestPackage/Package@swift-6.0.swift b/tests/TestPackage/Package@swift-6.0.swift
@@ -0,0 +1,22 @@
+// swift-tools-version: 6.0
+
+import PackageDescription
+
+let package = Package(
+  name: "TestPackage",
+  targets: [
+    .target(
+      name: "Target1"
+    ),
+    .target(
+      name: "Target2",
+      dependencies: [
+        "Target1"
+      ]
+    ),
+    .testTarget(
+      name: "Target1Tests",
+      dependencies: ["Target1"]
+    ),
+  ]
+)
diff --git a/tests/TestPackage/Sources/Target1/Target1.swift b/tests/TestPackage/Sources/Target1/Target1.swift
@@ -0,0 +1,13 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+public func foo() {}
diff --git a/tests/TestPackage/Sources/Target2/Target2.swift b/tests/TestPackage/Sources/Target2/Target2.swift
@@ -0,0 +1,17 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import Target1
+
+public func bar() {
+  foo()
+}
diff --git a/tests/TestPackage/Tests/Target1Tests/Target1Tests.swift b/tests/TestPackage/Tests/Target1Tests/Target1Tests.swift
@@ -0,0 +1,18 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import Target1
+import Testing
+
+@Test func example() async throws {
+  foo()
+}
