From 117bf916af3927f5755777cbd6dd23ce4334ba3a Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 11 Mar 2026 14:39:20 +0000 Subject: [PATCH] Sort OS list and versions consistently --- .github/workflows/__bundle-toolcache.yml | 4 ++-- .github/workflows/__bundle-zstd.yml | 4 ++-- .../workflows/__multi-language-autodetect.yml | 20 +++++++++---------- .../__resolve-environment-action.yml | 4 ++-- pr-checks/checks/bundle-toolcache.yml | 2 +- pr-checks/checks/bundle-zstd.yml | 2 +- .../checks/multi-language-autodetect.yml | 4 ++-- .../checks/resolve-environment-action.yml | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/__bundle-toolcache.yml b/.github/workflows/__bundle-toolcache.yml index 7b5e8d139..760647587 100644 --- a/.github/workflows/__bundle-toolcache.yml +++ b/.github/workflows/__bundle-toolcache.yml @@ -39,10 +39,10 @@ jobs: fail-fast: false matrix: include: - - os: macos-latest - version: linked - os: ubuntu-latest version: linked + - os: macos-latest + version: linked - os: windows-latest version: linked name: 'Bundle: Caching checks' diff --git a/.github/workflows/__bundle-zstd.yml b/.github/workflows/__bundle-zstd.yml index ede1e320c..85e069526 100644 --- a/.github/workflows/__bundle-zstd.yml +++ b/.github/workflows/__bundle-zstd.yml @@ -39,10 +39,10 @@ jobs: fail-fast: false matrix: include: - - os: macos-latest - version: linked - os: ubuntu-latest version: linked + - os: macos-latest + version: linked - os: windows-latest version: linked name: 'Bundle: Zstandard checks' diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index e1fea295e..33dbd2f69 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -59,41 +59,41 @@ jobs: fail-fast: false matrix: include: - - os: macos-latest - version: stable-v2.17.6 - os: ubuntu-latest version: stable-v2.17.6 - os: macos-latest - version: stable-v2.18.4 + version: stable-v2.17.6 - os: ubuntu-latest version: stable-v2.18.4 - os: macos-latest - version: stable-v2.19.4 + version: stable-v2.18.4 - os: ubuntu-latest version: stable-v2.19.4 - os: macos-latest - version: stable-v2.20.7 + version: stable-v2.19.4 - os: ubuntu-latest version: stable-v2.20.7 - os: macos-latest - version: stable-v2.21.4 + version: stable-v2.20.7 - os: ubuntu-latest version: stable-v2.21.4 - os: macos-latest - version: stable-v2.22.4 + version: stable-v2.21.4 - os: ubuntu-latest version: stable-v2.22.4 - os: macos-latest - version: default + version: stable-v2.22.4 - os: ubuntu-latest version: default - os: macos-latest - version: linked + version: default - os: ubuntu-latest version: linked - os: macos-latest + version: linked + - os: ubuntu-latest version: nightly-latest - - os: ubuntu-latest + - os: macos-latest version: nightly-latest name: Multi-language repository if: github.triggering_actor != 'dependabot[bot]' diff --git a/.github/workflows/__resolve-environment-action.yml b/.github/workflows/__resolve-environment-action.yml index 8b3391064..982e4e715 100644 --- a/.github/workflows/__resolve-environment-action.yml +++ b/.github/workflows/__resolve-environment-action.yml @@ -39,10 +39,10 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-latest - version: default - os: ubuntu-latest version: linked + - os: ubuntu-latest + version: default - os: ubuntu-latest version: nightly-latest name: Resolve environment diff --git a/pr-checks/checks/bundle-toolcache.yml b/pr-checks/checks/bundle-toolcache.yml index eb196419e..f5315d285 100644 --- a/pr-checks/checks/bundle-toolcache.yml +++ b/pr-checks/checks/bundle-toolcache.yml @@ -3,8 +3,8 @@ description: "The CodeQL bundle should be cached within the toolcache" versions: - linked operatingSystems: - - macos - ubuntu + - macos - windows steps: - name: Remove CodeQL from toolcache diff --git a/pr-checks/checks/bundle-zstd.yml b/pr-checks/checks/bundle-zstd.yml index 002334523..810f0b0c1 100644 --- a/pr-checks/checks/bundle-zstd.yml +++ b/pr-checks/checks/bundle-zstd.yml @@ -3,8 +3,8 @@ description: "A Zstandard CodeQL bundle should be extracted on supported operati versions: - linked operatingSystems: - - macos - ubuntu + - macos - windows steps: - name: Remove CodeQL from toolcache diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml index 688b58318..e005a9239 100644 --- a/pr-checks/checks/multi-language-autodetect.yml +++ b/pr-checks/checks/multi-language-autodetect.yml @@ -1,8 +1,8 @@ name: "Multi-language repository" -description: "An end-to-end integration test of a multi-language repository using automatic language detection for macOS" +description: "An end-to-end integration test of a multi-language repository using automatic language detection" operatingSystems: - - macos - ubuntu + - macos env: CODEQL_ACTION_RESOLVE_SUPPORTED_LANGUAGES_USING_CLI: true installGo: true diff --git a/pr-checks/checks/resolve-environment-action.yml b/pr-checks/checks/resolve-environment-action.yml index d06d74af2..4ea1bfad4 100644 --- a/pr-checks/checks/resolve-environment-action.yml +++ b/pr-checks/checks/resolve-environment-action.yml @@ -1,8 +1,8 @@ name: "Resolve environment" description: "Tests that the resolve-environment action works for Go and JavaScript/TypeScript" versions: - - default - linked + - default - nightly-latest steps: - uses: ./../action/init