Skip to content

Commit 84f4a46

Browse files
authored
Merge pull request #6 from beer-sakthai/claude/branch-commit-merge-main-n5m9pm
Fix fork CI: standard macOS runners and skip self-analysis uploads
2 parents 9eeb533 + 26a58bc commit 84f4a46

11 files changed

Lines changed: 26 additions & 26 deletions

‎.github/workflows/__all-platform-bundle.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__multi-language-autodetect.yml‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__per-language-bundle-validation.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__swift-autobuild.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__swift-custom-build.yml‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
strategy:
7575
fail-fast: false
7676
matrix:
77-
os: [ubuntu-22.04,ubuntu-24.04,windows-2022,windows-2025,macos-14-xlarge,macos-15-xlarge]
77+
os: [ubuntu-22.04,ubuntu-24.04,windows-2022,windows-2025,macos-14,macos-15]
7878
tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }}
7979
runs-on: ${{ matrix.os }}
8080

@@ -102,7 +102,7 @@ jobs:
102102
uses: ./analyze
103103
with:
104104
category: "/language:javascript"
105-
upload: ${{ (matrix.os == 'ubuntu-24.04' && !matrix.tools && github.event_name != 'merge_group' && 'always' ) || 'never' }}
105+
upload: ${{ (github.repository == 'github/codeql-action' && matrix.os == 'ubuntu-24.04' && !matrix.tools && github.event_name != 'merge_group' && 'always' ) || 'never' }}
106106

107107
analyze-other:
108108
if: github.triggering_actor != 'dependabot[bot]'
@@ -136,4 +136,4 @@ jobs:
136136
uses: ./analyze
137137
with:
138138
category: "/language:${{ matrix.language }}"
139-
upload: ${{ (github.event_name != 'merge_group' && 'always') || 'never' }}
139+
upload: ${{ (github.repository == 'github/codeql-action' && github.event_name != 'merge_group' && 'always') || 'never' }}

‎pr-checks/checks/all-platform-bundle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "Tests using an all-platform CodeQL Bundle"
33
operatingSystems:
44
- ubuntu
55
- os: macos
6-
runner-image: macos-latest-xlarge
6+
runner-image: macos-latest
77
- windows
88
versions:
99
- nightly-latest

‎pr-checks/checks/multi-language-autodetect.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ description: "An end-to-end integration test of a multi-language repository usin
33
operatingSystems:
44
- ubuntu
55
- os: macos
6-
runner-image: macos-latest-xlarge
6+
runner-image: macos-latest
77
# Older CodeQL CLI versions only support Swift up to 6.1, which requires Xcode 16. That is
88
# not available on macOS 26, so run these versions on macOS 15 where we select Xcode 16
99
# below. See https://github.com/actions/runner-images/issues/14167.
1010
- os: macos
11-
runner-image: macos-15-xlarge
11+
runner-image: macos-15
1212
codeql-versions:
1313
- stable-v2.19.4
1414
- stable-v2.20.7
@@ -30,7 +30,7 @@ steps:
3030

3131
- name: Use Xcode 16
3232
# Only the older CodeQL CLI versions need Xcode 16, and these run on macOS 15.
33-
if: matrix.os == 'macos-15-xlarge'
33+
if: matrix.os == 'macos-15'
3434
run: sudo xcode-select -s "/Applications/Xcode_16.app"
3535

3636
- uses: ./../action/init

‎pr-checks/checks/per-language-bundle-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ matrix:
3838
os: ubuntu-latest
3939
version: nightly-latest
4040
- language: swift
41-
os: macos-latest-xlarge
41+
os: macos-latest
4242
version: nightly-latest
4343
build-mode: autobuild
4444
env:

‎pr-checks/checks/swift-autobuild.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ versions:
44
- nightly-latest
55
operatingSystems:
66
- os: macos
7-
runner-image: macos-latest-xlarge
7+
runner-image: macos-latest
88
steps:
99
- uses: ./../action/init
1010
id: init

0 commit comments

Comments
 (0)