Update automerger workflow

.github/workflows/create_automerge_pr.yml

@@ -40,6 +40,10 @@ name: Create automerge PR
 #    types: [..., ready_for_review]
 # ```
 # Unfortunately this will also re-trigger testing evenon a normal user's PR (which may have already been tested), but skipping them causes the checks to reset so this is the best we can do for now.
+
+permissions:
+  contents: read
+
 on:
   workflow_call:
     inputs:
@@ -55,6 +59,14 @@ on:
         type: string
         description: The message that should be included in the PR created by this job
         default: This PR was automatically opened by a GitHub action. Review the changes included in this PR and determine if they should be included in the release branch. If yes, merge the PR. Otherwise revert changes that should not be included on this branch.
+      create_as_draft:
+        type: boolean
+        description: Whether to create the PR as a draft
+        default: true
+      should_test:
+        type: boolean
+        description: Whether the created PR should trigger tests
+        default: false
 
 jobs:
   create_merge_pr:
@@ -89,6 +101,10 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
+          # Define variables based on workflow input
+          if [[ "${{ inputs.create_as_draft }} == "true" ]] ; then
+            DRAFT_FLAG="--draft"
+          fi
           # Create a branch for the PR instead of opening a PR that merges head_branch directly so that we have a fixed
           # target in the PR and don't modify the PR as new commits are put on the head branch.
           PR_BRANCH="automerge/merge-main-$(date +%Y-%m-%d_%H-%M)"
@@ -98,7 +114,11 @@ jobs:
 
           gh pr create \
             --base "${{ inputs.base_branch }}" \
-            --head "$PR_BRANCH" \
+            --head "$PR_BRANCH" ${DRAFT_FLAG} \
             --title 'Merge `${{ inputs.head_branch }}` into `${{ inputs.base_branch }}`' \
-            --body '${{ inputs.pr_message }}' \
-            --draft
+            --body '${{ inputs.pr_message }}'
+
+          # Trigger tests is requested
+          if [[ "${{ inputs.should_test }}" == "true" ]] ; then
+            gh pr ready "$PR_BRANCH"
+          fi

.github/workflows/performance_test.yml

@@ -1,5 +1,8 @@
 name: Performance test
 
+permissions:
+  contents: read
+
 on:
   workflow_call:
     inputs:

.github/workflows/pull_request.yml

@@ -1,5 +1,8 @@
 name: Pull request
 
+permissions:
+  contents: read
+
 on:
   pull_request:
     types: [opened, reopened, synchronize]
@@ -41,6 +44,12 @@ jobs:
         cd MyPackage
         swift package init --type library
       enable_wasm_sdk_build: true
+      # Android
+      android_sdk_pre_build_command: |
+        mkdir MyPackage
+        cd MyPackage
+        swift package init --type library
+      enable_android_sdk_build: true
       # Windows
       windows_build_command: |
         mkdir MyPackage
@@ -55,6 +64,12 @@ jobs:
     with:
       # Skip Linux which doesn't currently support docker-less workflow
       enable_linux_checks: false
+      # Android
+      android_sdk_pre_build_command: |
+        mkdir MyPackage
+        cd MyPackage
+        swift package init --type library
+      enable_android_sdk_build: true
       # Windows
       windows_build_command: |
         mkdir MyPackage
@@ -77,10 +92,21 @@ jobs:
         xcrun swift package init --type library
         xcrun swift build
 
+  build_tests_ios:
+    name: Build iOS Tests
+    uses: ./.github/workflows/swift_package_test.yml
+    with:
+      enable_linux_checks: false
+      enable_windows_checks: false
+      # iOS
+      enable_ios_checks: true
+      ios_pre_build_command: |
+        pwd
+        xcrun swift package init --type library
+
   soundness:
     name: Soundness
     uses: ./.github/workflows/soundness.yml
     with:
       api_breakage_check_enabled: false
       license_header_check_project_name: "Swift.org"
-      format_check_enabled: false

.github/workflows/scripts/check-docs.sh

@@ -23,7 +23,7 @@ if [ ! -f .spi.yml ]; then
 fi
 
 if ! command -v yq &> /dev/null; then
-  fatal "yq could not be found. Please install yq to proceed."
+  apt -q update && apt -yq install yq
 fi
 
 package_files=$(find . -maxdepth 1 -name 'Package*.swift')

.github/workflows/scripts/check-license-header.sh

@@ -91,6 +91,7 @@ while IFS= read -r file_path; do
     plist) continue ;; # Plists don't support line comments
     proto) comment_marker='//' ;;
     ps1) comment_marker='##' ;;
+    psm1) comment_marker='##' ;;
     py) comment_marker='##'; header_prefix=$'#!/usr/bin/env python3\n' ;;
     rb) comment_marker='##'; header_prefix=$'#!/usr/bin/env ruby\n' ;;
     sh) comment_marker='##'; header_prefix=$'#!/bin/bash\n' ;;
@@ -116,7 +117,7 @@ while IFS= read -r file_path; do
   file_header=$(head -n "${expected_file_header_linecount}" "${file_path}")
   normalized_file_header=$(
     echo "${file_header}" \
-    | sed -E -e 's/20[12][0123456789] ?- ?20[12][0123456789]/YEARS/' -e 's/20[12][0123456789]/YEARS/' \
+    | sed -E -e 's/20[12][0123456789] ?[-–] ?20[12][0123456789]/YEARS/' -e 's/20[12][0123456789]/YEARS/' \
   )
 
   if ! diff -u \

.github/workflows/scripts/check-swift-format.sh

@@ -21,19 +21,19 @@ fatal() { error "$@"; exit 1; }
 if [[ -f .swiftformatignore ]]; then
     log "Found swiftformatignore file..."
 
-    log "Running swift format format..."
-    tr '\n' '\0' < .swiftformatignore| xargs -0 -I% printf '":(exclude)%" '| xargs git ls-files -z '*.swift' | xargs -0 swift format format --parallel --in-place
+    log "Running swift-format format..."
+    tr '\n' '\0' < .swiftformatignore| xargs -0 -I% printf '":(exclude)%" '| xargs git ls-files -z '*.swift' | xargs -0 swift-format format --parallel --in-place
 
-    log "Running swift format lint..."
+    log "Running swift-format lint..."
 
-    tr '\n' '\0' < .swiftformatignore | xargs -0 -I% printf '":(exclude)%" '| xargs git ls-files -z '*.swift' | xargs -0 swift format lint --strict --parallel
+    tr '\n' '\0' < .swiftformatignore | xargs -0 -I% printf '":(exclude)%" '| xargs git ls-files -z '*.swift' | xargs -0 swift-format lint --strict --parallel
 else
-    log "Running swift format format..."
-    git ls-files -z '*.swift' | xargs -0 swift format format --parallel --in-place
+    log "Running swift-format format..."
+    git ls-files -z '*.swift' | xargs -0 swift-format format --parallel --in-place
 
-    log "Running swift format lint..."
+    log "Running swift-format lint..."
 
-    git ls-files -z '*.swift' | xargs -0 swift format lint --strict --parallel
+    git ls-files -z '*.swift' | xargs -0 swift-format lint --strict --parallel
 fi