From c8f02701d44eed6f1f0ce57096752483070c1cdc Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 23 Sep 2026 17:11:09 +0000 Subject: [PATCH 1/3] Use standard macOS runners instead of larger (xlarge) runners The `*-xlarge` macOS runners are GitHub larger runners that are not available to this fork, so every job targeting them failed without starting. Switch to the standard hosted equivalents (macos-latest, macos-15, macos-14) in the PR-check sources and codeql.yml, and regenerate the PR-check workflows with pr-checks/sync.sh. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01A6REV1f9XMQdyBtTufzb8e --- .github/workflows/__all-platform-bundle.yml | 2 +- .../workflows/__multi-language-autodetect.yml | 20 +++++++++---------- .../__per-language-bundle-validation.yml | 2 +- .github/workflows/__swift-autobuild.yml | 2 +- .github/workflows/__swift-custom-build.yml | 6 +++--- .github/workflows/codeql.yml | 2 +- pr-checks/checks/all-platform-bundle.yml | 2 +- .../checks/multi-language-autodetect.yml | 6 +++--- .../checks/per-language-bundle-validation.yml | 2 +- pr-checks/checks/swift-autobuild.yml | 2 +- pr-checks/checks/swift-custom-build.yml | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/__all-platform-bundle.yml b/.github/workflows/__all-platform-bundle.yml index 4846d13f1e..c3cf8d63f3 100644 --- a/.github/workflows/__all-platform-bundle.yml +++ b/.github/workflows/__all-platform-bundle.yml @@ -56,7 +56,7 @@ jobs: include: - os: ubuntu-latest version: nightly-latest - - os: macos-latest-xlarge + - os: macos-latest version: nightly-latest - os: windows-latest version: nightly-latest diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 0a0f201ead..f63779ea1e 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -56,39 +56,39 @@ jobs: include: - os: ubuntu-latest version: stable-v2.19.4 - - os: macos-15-xlarge + - os: macos-15 version: stable-v2.19.4 - os: ubuntu-latest version: stable-v2.20.7 - - os: macos-15-xlarge + - os: macos-15 version: stable-v2.20.7 - os: ubuntu-latest version: stable-v2.21.4 - - os: macos-15-xlarge + - os: macos-15 version: stable-v2.21.4 - os: ubuntu-latest version: stable-v2.22.4 - - os: macos-15-xlarge + - os: macos-15 version: stable-v2.22.4 - os: ubuntu-latest version: stable-v2.23.9 - - os: macos-latest-xlarge + - os: macos-latest version: stable-v2.23.9 - os: ubuntu-latest version: stable-v2.24.3 - - os: macos-latest-xlarge + - os: macos-latest version: stable-v2.24.3 - os: ubuntu-latest version: default - - os: macos-latest-xlarge + - os: macos-latest version: default - os: ubuntu-latest version: linked - - os: macos-latest-xlarge + - os: macos-latest version: linked - os: ubuntu-latest version: nightly-latest - - os: macos-latest-xlarge + - os: macos-latest version: nightly-latest name: Multi-language repository if: github.triggering_actor != 'dependabot[bot]' @@ -126,7 +126,7 @@ jobs: - name: Use Xcode 16 # Only the older CodeQL CLI versions need Xcode 16, and these run on macOS 15. - if: matrix.os == 'macos-15-xlarge' + if: matrix.os == 'macos-15' run: sudo xcode-select -s "/Applications/Xcode_16.app" - uses: ./../action/init diff --git a/.github/workflows/__per-language-bundle-validation.yml b/.github/workflows/__per-language-bundle-validation.yml index ea900a9e09..1cef64386f 100644 --- a/.github/workflows/__per-language-bundle-validation.yml +++ b/.github/workflows/__per-language-bundle-validation.yml @@ -68,7 +68,7 @@ jobs: os: ubuntu-latest version: nightly-latest - language: swift - os: macos-latest-xlarge + os: macos-latest version: nightly-latest build-mode: autobuild name: Per-language bundles diff --git a/.github/workflows/__swift-autobuild.yml b/.github/workflows/__swift-autobuild.yml index 52c189f3a8..5643a314aa 100644 --- a/.github/workflows/__swift-autobuild.yml +++ b/.github/workflows/__swift-autobuild.yml @@ -34,7 +34,7 @@ jobs: fail-fast: false matrix: include: - - os: macos-latest-xlarge + - os: macos-latest version: nightly-latest name: Swift analysis using autobuild if: github.triggering_actor != 'dependabot[bot]' diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index 000b681eb4..99fbf7a897 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -54,11 +54,11 @@ jobs: fail-fast: false matrix: include: - - os: macos-latest-xlarge + - os: macos-latest version: linked - - os: macos-latest-xlarge + - os: macos-latest version: default - - os: macos-latest-xlarge + - os: macos-latest version: nightly-latest name: Swift analysis using a custom build command if: github.triggering_actor != 'dependabot[bot]' diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f27de17fd8..2644bafb34 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -74,7 +74,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04,ubuntu-24.04,windows-2022,windows-2025,macos-14-xlarge,macos-15-xlarge] + os: [ubuntu-22.04,ubuntu-24.04,windows-2022,windows-2025,macos-14,macos-15] tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }} runs-on: ${{ matrix.os }} diff --git a/pr-checks/checks/all-platform-bundle.yml b/pr-checks/checks/all-platform-bundle.yml index a13ba7cdee..37799986bb 100644 --- a/pr-checks/checks/all-platform-bundle.yml +++ b/pr-checks/checks/all-platform-bundle.yml @@ -3,7 +3,7 @@ description: "Tests using an all-platform CodeQL Bundle" operatingSystems: - ubuntu - os: macos - runner-image: macos-latest-xlarge + runner-image: macos-latest - windows versions: - nightly-latest diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml index b9d80d1077..893468833b 100644 --- a/pr-checks/checks/multi-language-autodetect.yml +++ b/pr-checks/checks/multi-language-autodetect.yml @@ -3,12 +3,12 @@ description: "An end-to-end integration test of a multi-language repository usin operatingSystems: - ubuntu - os: macos - runner-image: macos-latest-xlarge + runner-image: macos-latest # Older CodeQL CLI versions only support Swift up to 6.1, which requires Xcode 16. That is # not available on macOS 26, so run these versions on macOS 15 where we select Xcode 16 # below. See https://github.com/actions/runner-images/issues/14167. - os: macos - runner-image: macos-15-xlarge + runner-image: macos-15 codeql-versions: - stable-v2.19.4 - stable-v2.20.7 @@ -30,7 +30,7 @@ steps: - name: Use Xcode 16 # Only the older CodeQL CLI versions need Xcode 16, and these run on macOS 15. - if: matrix.os == 'macos-15-xlarge' + if: matrix.os == 'macos-15' run: sudo xcode-select -s "/Applications/Xcode_16.app" - uses: ./../action/init diff --git a/pr-checks/checks/per-language-bundle-validation.yml b/pr-checks/checks/per-language-bundle-validation.yml index 21fe33e757..9b270c7ad0 100644 --- a/pr-checks/checks/per-language-bundle-validation.yml +++ b/pr-checks/checks/per-language-bundle-validation.yml @@ -38,7 +38,7 @@ matrix: os: ubuntu-latest version: nightly-latest - language: swift - os: macos-latest-xlarge + os: macos-latest version: nightly-latest build-mode: autobuild env: diff --git a/pr-checks/checks/swift-autobuild.yml b/pr-checks/checks/swift-autobuild.yml index 393857cd2c..264682d3b6 100644 --- a/pr-checks/checks/swift-autobuild.yml +++ b/pr-checks/checks/swift-autobuild.yml @@ -4,7 +4,7 @@ versions: - nightly-latest operatingSystems: - os: macos - runner-image: macos-latest-xlarge + runner-image: macos-latest steps: - uses: ./../action/init id: init diff --git a/pr-checks/checks/swift-custom-build.yml b/pr-checks/checks/swift-custom-build.yml index 53131b1aef..7c776490a5 100644 --- a/pr-checks/checks/swift-custom-build.yml +++ b/pr-checks/checks/swift-custom-build.yml @@ -6,7 +6,7 @@ versions: - nightly-latest operatingSystems: - os: macos - runner-image: macos-latest-xlarge + runner-image: macos-latest installGo: true installDotNet: true env: From 26a58bcb8792f8bae34e13b61e81ccca1776db91 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 23 Sep 2026 17:24:54 +0000 Subject: [PATCH 2/3] Only upload CodeQL self-analysis results from the upstream repository This fork has CodeQL default setup enabled, which rejects SARIF from advanced configurations, so the `analyze-javascript (ubuntu-24.04)` and `analyze-other` jobs failed at upload. Default setup already scans this repository, so keep running the analyses but only upload when running in github/codeql-action. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01A6REV1f9XMQdyBtTufzb8e --- .github/workflows/codeql.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2644bafb34..880b1ea640 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -102,7 +102,7 @@ jobs: uses: ./analyze with: category: "/language:javascript" - upload: ${{ (matrix.os == 'ubuntu-24.04' && !matrix.tools && github.event_name != 'merge_group' && 'always' ) || 'never' }} + upload: ${{ (github.repository == 'github/codeql-action' && matrix.os == 'ubuntu-24.04' && !matrix.tools && github.event_name != 'merge_group' && 'always' ) || 'never' }} analyze-other: if: github.triggering_actor != 'dependabot[bot]' @@ -136,4 +136,4 @@ jobs: uses: ./analyze with: category: "/language:${{ matrix.language }}" - upload: ${{ (github.event_name != 'merge_group' && 'always') || 'never' }} + upload: ${{ (github.repository == 'github/codeql-action' && github.event_name != 'merge_group' && 'always') || 'never' }} From d5bb663e0855e7b5a7ec16578bdd27cd46d3d08a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Oct 2026 02:49:53 +0000 Subject: [PATCH 3/3] Bump brace-expansion Bumps the npm_and_yarn group with 1 update in the / directory: [brace-expansion](https://github.com/juliangruber/brace-expansion). Updates `brace-expansion` from 1.1.18 to 1.1.21 - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](https://github.com/juliangruber/brace-expansion/compare/v1.1.18...v1.1.21) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 1.1.21 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] --- package-lock.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index d4f189db2a..c54c246243 100644 --- a/package-lock.json +++ b/package-lock.json @@ -374,9 +374,9 @@ "license": "Apache-2.0" }, "node_modules/@actions/artifact/node_modules/brace-expansion": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz", - "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz", + "integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==", "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" @@ -2967,9 +2967,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz", - "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz", + "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4001,9 +4001,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.18", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz", - "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==", + "version": "1.1.21", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz", + "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==", "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -5311,9 +5311,9 @@ } }, "node_modules/eslint-plugin-import-x/node_modules/brace-expansion": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz", - "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz", + "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==", "dev": true, "license": "MIT", "dependencies": { @@ -6221,9 +6221,9 @@ } }, "node_modules/glob/node_modules/brace-expansion": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz", - "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz", + "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==", "license": "MIT", "dependencies": { "balanced-match": "^4.0.2" @@ -8721,9 +8721,9 @@ } }, "node_modules/readdir-glob/node_modules/brace-expansion": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz", - "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz", + "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==", "license": "MIT", "dependencies": { "balanced-match": "^4.0.2"