Merge branch 'main' into jgrynspan/build-packages-for-ios

Author: grynspan

.github/workflows/soundness.yml

@@ -18,15 +18,15 @@ on:
       api_breakage_check_container_image:
         type: string
         description: "Container image for the API breakage check job. Defaults to latest Swift Ubuntu image."
-        default: "swift:6.1-noble"
+        default: "swift:6.2-noble"
       docs_check_enabled:
         type: boolean
         description: "Boolean to enable the docs check job. Defaults to true."
         default: true
       docs_check_container_image:
         type: string
         description: "Container image for the docs check job. Defaults to latest Swift Ubuntu image."
-        default: "swift:6.1-noble"
+        default: "swift:6.2-noble"
       docs_check_additional_arguments:
         type: string
         description: "Additional arguments that should be passed to docc"
@@ -58,15 +58,15 @@ on:
       format_check_container_image:
         type: string
         description: "Container image for the format check job. Defaults to latest Swift Ubuntu image."
-        default: "swift:6.1-noble"
+        default: "swift:6.2-noble"
       shell_check_enabled:
         type: boolean
         description: "Boolean to enable the shell check job. Defaults to true."
         default: true
       shell_check_container_image:
         type: string
         description: "Container image for the shell check job. Defaults to latest Swift Ubuntu image."
-        default: "swift:6.1-noble"
+        default: "swift:6.2-noble"
       yamllint_check_enabled:
         type: boolean
         description: "Boolean to enable the YAML lint check job. Defaults to true."
@@ -80,6 +80,9 @@ on:
         description: "Linux command to execute before building the Swift package"
         default: ""
 
+permissions:
+  contents: read
+
 ## We are cancelling previously triggered workflow runs
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-soundness

.github/workflows/swift_package_test.yml

@@ -6,7 +6,7 @@ on:
       macos_xcode_versions:
         type: string
         description: "Xcode version list (JSON)"
-        default: "[\"16.2\", \"16.3\", \"26.b6\"]"
+        default: "[\"16.3\", \"16.4\", \"26.0\"]"
       macos_exclude_xcode_versions:
         type: string
         description: "Exclude Xcode version list (JSON)"
@@ -38,7 +38,7 @@ on:
       linux_swift_versions:
         type: string
         description: "Include Linux Swift version list (JSON)"
-        default: "[ \"5.9\", \"5.10\", \"6.0\", \"6.1\", \"nightly-main\", \"nightly-6.2\"]"
+        default: "[ \"5.9\", \"5.10\", \"6.0\", \"6.1\", \"6.2\", \"nightly-main\", \"nightly-6.2\"]"
       linux_exclude_swift_versions:
         type: string
         description: "Exclude Linux Swift version list (JSON)"
@@ -50,11 +50,15 @@ on:
       linux_static_sdk_versions:
         type: string
         description: "Static Linux Swift SDK version list (JSON)"
-        default: "[\"nightly-6.2\"]"
+        default: "[\"nightly-main\", \"nightly-6.2\", \"6.2\"]"
+      linux_static_sdk_exclude_swift_versions:
+        type: string
+        description: "Exclude Static Linux Swift SDK version list (JSON)"
+        default: "[{\"swift_version\": \"\"}]"
       wasm_sdk_versions:
         type: string
         description: "Wasm Swift SDK version list (JSON)"
-        default: "[\"nightly-main\", \"nightly-6.2\"]"
+        default: "[\"nightly-main\", \"nightly-6.2\", \"6.2\"]"
       wasm_exclude_swift_versions:
         type: string
         description: "Exclude Wasm Swift SDK version list (JSON)"
@@ -63,7 +67,7 @@ on:
         type: string
         description: "Include Windows Swift version list (JSON)"
         # "5.10" is omitted for Windows because the container image is broken.
-        default: "[\"5.9\", \"6.0\", \"6.1\", \"nightly\", \"nightly-6.2\"]"
+        default: "[\"5.9\", \"6.0\", \"6.1\", \"6.2\", \"nightly\", \"nightly-6.2\"]"
       windows_exclude_swift_versions:
         type: string
         description: "Exclude Windows Swift version list (JSON)"
@@ -211,6 +215,8 @@ jobs:
         run: echo "DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode_version }}.app" >> $GITHUB_ENV
       - name: Swift version
         run: xcrun swift --version
+      - name: Clang version
+        run: xcrun clang --version
       - name: Pre-build
         run: ${{ inputs.macos_pre_build_command }}
       - name: Build / Test
@@ -305,6 +311,8 @@ jobs:
     steps:
       - name: Swift version
         run: swift --version
+      - name: Clang version
+        run: clang --version
       - name: Checkout repository
         uses: actions/checkout@v4
         if: ${{ matrix.os_version != 'amazonlinux2' }}
@@ -342,11 +350,15 @@ jobs:
       matrix:
         swift_version: ${{ fromJson(inputs.linux_static_sdk_versions) }}
         os_version: ${{ fromJson(inputs.linux_os_versions) }}
+        exclude:
+          - ${{ fromJson(inputs.linux_static_sdk_exclude_swift_versions) }}
     container:
       image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
     steps:
       - name: Swift version
         run: swift --version
+      - name: Clang version
+        run: clang --version
       - name: Checkout repository
         uses: actions/checkout@v4
         if: ${{ matrix.os_version != 'amazonlinux2' }}
@@ -402,6 +414,8 @@ jobs:
     steps:
       - name: Swift version
         run: swift --version
+      - name: Clang version
+        run: clang --version
       - name: Checkout repository
         uses: actions/checkout@v4
         if: ${{ matrix.os_version != 'amazonlinux2' }}
@@ -457,6 +471,8 @@ jobs:
     steps:
       - name: Swift version
         run: swift --version
+      - name: Clang version
+        run: clang --version
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Provide token
@@ -561,6 +577,7 @@ jobs:
           }
           Invoke-Program swift --version
           Invoke-Program swift test --version
+          Invoke-Program clang --version
           Invoke-Program cd $Source
           '@ >> $env:TEMP\test-script\run.ps1