From 1e5919b22dbfde6942eeb2f488dbce40532fe969 Mon Sep 17 00:00:00 2001 From: Chuan-kai Lin Date: Fri, 2 Dec 2022 07:38:17 -0800 Subject: [PATCH 1/2] Bump default CodeQL version to 2.11.5 --- CHANGELOG.md | 2 +- lib/defaults.json | 2 +- src/defaults.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ebf0bde36..179bcb663b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## [UNRELEASED] -No user facing changes. +- Update default CodeQL bundle version to 2.11.5. [#1412](https://github.com/github/codeql-action/pull/1412) ## 2.1.35 - 01 Dec 2022 diff --git a/lib/defaults.json b/lib/defaults.json index 0f32e5d5ff..9a446e6c9b 100644 --- a/lib/defaults.json +++ b/lib/defaults.json @@ -1,3 +1,3 @@ { - "bundleVersion": "codeql-bundle-20221123" + "bundleVersion": "codeql-bundle-20221202" } diff --git a/src/defaults.json b/src/defaults.json index a83d15c8d7..51120ae77c 100644 --- a/src/defaults.json +++ b/src/defaults.json @@ -1,3 +1,3 @@ { - "bundleVersion": "codeql-bundle-20221123" + "bundleVersion": "codeql-bundle-20221202" } From fb74504ab55fd3a0ed9044599cdef472e3a680e7 Mon Sep 17 00:00:00 2001 From: Chuan-kai Lin Date: Wed, 7 Dec 2022 17:59:30 +0000 Subject: [PATCH 2/2] Disable nightly-latest checks for Swift --- .github/workflows/__multi-language-autodetect.yml | 4 ---- .github/workflows/__swift-custom-build.yml | 4 ---- pr-checks/checks/multi-language-autodetect.yml | 2 ++ pr-checks/checks/swift-custom-build.yml | 3 ++- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 9df6d57932..3525d5d38e 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -45,10 +45,6 @@ jobs: version: latest - os: macos-latest version: latest - - os: ubuntu-latest - version: nightly-latest - - os: macos-latest - version: nightly-latest name: Multi-language repository timeout-minutes: 45 runs-on: ${{ matrix.os }} diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index 1d69ecabe6..7d7c151868 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -33,10 +33,6 @@ jobs: version: cached - os: macos-latest version: cached - - os: ubuntu-latest - version: nightly-latest - - os: macos-latest - version: nightly-latest name: Swift analysis using a custom build command timeout-minutes: 45 runs-on: ${{ matrix.os }} diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml index d7732b0e64..3832278aab 100644 --- a/pr-checks/checks/multi-language-autodetect.yml +++ b/pr-checks/checks/multi-language-autodetect.yml @@ -1,5 +1,7 @@ name: "Multi-language repository" description: "An end-to-end integration test of a multi-language repository using automatic language detection" +# Temporarily exclude nightly-latest to unblock release +versions: ["stable-20211005", "stable-20220120", "stable-20220401", "cached", "latest"] operatingSystems: ["ubuntu", "macos"] env: CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: "true" # Remove when Swift is GA. diff --git a/pr-checks/checks/swift-custom-build.yml b/pr-checks/checks/swift-custom-build.yml index fb1402c945..733d9ad26a 100644 --- a/pr-checks/checks/swift-custom-build.yml +++ b/pr-checks/checks/swift-custom-build.yml @@ -1,6 +1,7 @@ name: "Swift analysis using a custom build command" description: "Tests creation of a Swift database using custom build" -versions: ["latest", "cached", "nightly-latest"] +# Temporarily exclude nightly-latest to unblock release +versions: ["latest", "cached"] operatingSystems: ["ubuntu", "macos"] env: CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: "true"