Merge pull request #1121 from swiftlang/automerge/merge-main-2025-12-15_09-13

Merge `main` into `release/6.3`

Author: beccadax

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/auto_update_version.yml

@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           ref: ${{ github.ref }}

.github/workflows/automerge.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   create_merge_pr:
     name: Create PR to merge main into release branch
-    uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main
+    uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@0.0.2
     with:
       base_branch: release/6.3
     permissions:

.github/workflows/publish_release.yml

@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: |
-          if [[ "${{ github.triggering_actor }}" != "bnbarham" ]]; then
+          if [[ "${{ github.triggering_actor }}" != "rintaro" && "${{ github.triggering_actor }}" != "hamishknight" ]]; then
             echo "${{ github.triggering_actor }} is not allowed to create a release"
             exit 1
           fi
@@ -69,7 +69,7 @@ jobs:
           echo "Using swift-format version: $SWIFT_FORMAT_VERSION"
           echo "swift_format_version=$SWIFT_FORMAT_VERSION" >> "$GITHUB_OUTPUT"
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Create release commits
         id: create_release_commits
         run: |
@@ -95,7 +95,7 @@ jobs:
           } >> "$GITHUB_OUTPUT"
   test:
     name: Test in ${{ matrix.release && 'Release' || 'Debug' }} configuration
-    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
+    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
     needs: create_release_commits
     strategy:
       fail-fast: false
@@ -129,7 +129,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Apply release commits
         run: |
           git config --global --add safe.directory "$(realpath .)"
@@ -152,7 +152,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Create release
         env:
           GH_TOKEN: ${{ github.token }}

.github/workflows/pull_request.yml

@@ -17,14 +17,14 @@ concurrency:
 jobs:
   tests:
     name: Test
-    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
+    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
     with:
       enable_cross_pr_testing: true
       linux_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}]"
       windows_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}]"
   soundness:
     name: Soundness
-    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
+    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@0.0.2
     with:
       license_header_check_project_name: "Swift.org"
       api_breakage_check_allowlist_path: "api-breakages.txt"
@@ -36,7 +36,7 @@ jobs:
       image: swift:6.2
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
       - name: Mark the workspace as safe
@@ -63,7 +63,7 @@ jobs:
           cd "$GITHUB_WORKSPACE"
           /tmp/check-swift-format.sh
       - name: Checkout swift-syntax
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: swiftlang/swift-syntax
           persist-credentials: false
@@ -73,7 +73,7 @@ jobs:
           cd "$GITHUB_WORKSPACE/swift-syntax"
           /tmp/check-swift-format.sh
       - name: Checkout sourcekit-lsp
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: swiftlang/sourcekit-lsp
           persist-credentials: false

CODEOWNERS

@@ -8,7 +8,7 @@
 # See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 #
 
-* @allevato @bnbarham @hamishknight @rintaro
+* @allevato @hamishknight @rintaro
 
-.github/ @bnbarham @shahmishal
-.swiftci/ @bnbarham @shahmishal
+.github/ @shahmishal
+.swiftci/ @shahmishal