From 7419bc61b3ba0c1e8c31859fe0725529a25baf16 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Fri, 30 May 2025 17:21:35 +0100 Subject: [PATCH] Update CodeQL versions in generated workflows --- .github/workflows/__cpp-deptrace-enabled-on-macos.yml | 2 ++ .github/workflows/__go-tracing-autobuilder.yml | 8 ++++---- .github/workflows/__go-tracing-custom-build-steps.yml | 8 ++++---- .github/workflows/__go-tracing-legacy-workflow.yml | 8 ++++---- .github/workflows/__multi-language-autodetect.yml | 8 ++++---- pr-checks/checks/cpp-deptrace-enabled-on-macos.yml | 2 +- pr-checks/sync.py | 4 ++-- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/workflows/__cpp-deptrace-enabled-on-macos.yml b/.github/workflows/__cpp-deptrace-enabled-on-macos.yml index d2e417161..fa8dcf07a 100644 --- a/.github/workflows/__cpp-deptrace-enabled-on-macos.yml +++ b/.github/workflows/__cpp-deptrace-enabled-on-macos.yml @@ -27,6 +27,8 @@ jobs: fail-fast: false matrix: include: + - os: macos-latest + version: linked - os: macos-latest version: nightly-latest name: 'C/C++: autoinstalling dependencies is skipped (macOS)' diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index 37fd12d9a..5adae3f44 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -27,10 +27,6 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-latest - version: stable-v2.15.5 - - os: macos-latest - version: stable-v2.15.5 - os: ubuntu-latest version: stable-v2.16.6 - os: macos-latest @@ -47,6 +43,10 @@ jobs: version: stable-v2.19.4 - os: macos-latest version: stable-v2.19.4 + - os: ubuntu-latest + version: stable-v2.20.7 + - os: macos-latest + version: stable-v2.20.7 - os: ubuntu-latest version: default - os: macos-latest diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index afd196ff6..99d162e71 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -27,10 +27,6 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-latest - version: stable-v2.15.5 - - os: macos-latest - version: stable-v2.15.5 - os: ubuntu-latest version: stable-v2.16.6 - os: macos-latest @@ -47,6 +43,10 @@ jobs: version: stable-v2.19.4 - os: macos-latest version: stable-v2.19.4 + - os: ubuntu-latest + version: stable-v2.20.7 + - os: macos-latest + version: stable-v2.20.7 - os: ubuntu-latest version: default - os: macos-latest diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index 52c9a51d9..76427e813 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -27,10 +27,6 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-latest - version: stable-v2.15.5 - - os: macos-latest - version: stable-v2.15.5 - os: ubuntu-latest version: stable-v2.16.6 - os: macos-latest @@ -47,6 +43,10 @@ jobs: version: stable-v2.19.4 - os: macos-latest version: stable-v2.19.4 + - os: ubuntu-latest + version: stable-v2.20.7 + - os: macos-latest + version: stable-v2.20.7 - os: ubuntu-latest version: default - os: macos-latest diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 5d9cc9974..b323d506b 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -27,10 +27,6 @@ jobs: fail-fast: false matrix: include: - - os: macos-latest - version: stable-v2.15.5 - - os: ubuntu-latest - version: stable-v2.15.5 - os: macos-latest version: stable-v2.16.6 - os: ubuntu-latest @@ -47,6 +43,10 @@ jobs: version: stable-v2.19.4 - os: ubuntu-latest version: stable-v2.19.4 + - os: macos-latest + version: stable-v2.20.7 + - os: ubuntu-latest + version: stable-v2.20.7 - os: macos-latest version: default - os: ubuntu-latest diff --git a/pr-checks/checks/cpp-deptrace-enabled-on-macos.yml b/pr-checks/checks/cpp-deptrace-enabled-on-macos.yml index 8a70f82fa..33f1416bf 100644 --- a/pr-checks/checks/cpp-deptrace-enabled-on-macos.yml +++ b/pr-checks/checks/cpp-deptrace-enabled-on-macos.yml @@ -1,7 +1,7 @@ name: "C/C++: autoinstalling dependencies is skipped (macOS)" description: "Checks that running C/C++ autobuild with autoinstalling dependencies explicitly enabled is a no-op on macOS" operatingSystems: ["macos"] -versions: ["nightly-latest"] # This is not released yet, will come with 2.15.2 +versions: ["linked", "nightly-latest"] env: DOTNET_GENERATE_ASPNET_CERTIFICATE: "false" steps: diff --git a/pr-checks/sync.py b/pr-checks/sync.py index f27dbdd8f..9986f2ae9 100755 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -9,8 +9,6 @@ import os # The default set of CodeQL Bundle versions to use for the PR checks. defaultTestVersions = [ # The oldest supported CodeQL version. If bumping, update `CODEQL_MINIMUM_VERSION` in `codeql.ts` - "stable-v2.15.5", - # The last CodeQL release in the 2.16 series. "stable-v2.16.6", # The last CodeQL release in the 2.17 series. "stable-v2.17.6", @@ -18,6 +16,8 @@ defaultTestVersions = [ "stable-v2.18.4", # The last CodeQL release in the 2.19 series. "stable-v2.19.4", + # The last CodeQL release in the 2.20 series. + "stable-v2.20.7", # The default version of CodeQL for Dotcom, as determined by feature flags. "default", # The version of CodeQL shipped with the Action in `defaults.json`. During the release process