From 8fae32eb183816404b81b714c0dc84a12427cb26 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:18:58 +0000 Subject: [PATCH 1/3] Update default bundle to codeql-bundle-v2.16.2 --- lib/defaults.json | 8 ++++---- src/defaults.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/defaults.json b/lib/defaults.json index a395818a14..6fecfa3bdb 100644 --- a/lib/defaults.json +++ b/lib/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.16.1", - "cliVersion": "2.16.1", - "priorBundleVersion": "codeql-bundle-v2.16.0", - "priorCliVersion": "2.16.0" + "bundleVersion": "codeql-bundle-v2.16.2", + "cliVersion": "2.16.2", + "priorBundleVersion": "codeql-bundle-v2.16.1", + "priorCliVersion": "2.16.1" } diff --git a/src/defaults.json b/src/defaults.json index ac2c207e10..31028a6f69 100644 --- a/src/defaults.json +++ b/src/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.16.1", - "cliVersion": "2.16.1", - "priorBundleVersion": "codeql-bundle-v2.16.0", - "priorCliVersion": "2.16.0" + "bundleVersion": "codeql-bundle-v2.16.2", + "cliVersion": "2.16.2", + "priorBundleVersion": "codeql-bundle-v2.16.1", + "priorCliVersion": "2.16.1" } From 9a734dafa18de81f414b2837120067625bf77c1d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:19:02 +0000 Subject: [PATCH 2/3] Add changelog note --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a547fa350d..379e8fcccf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the ## [UNRELEASED] -No user facing changes. +- Update default CodeQL bundle version to 2.16.2. [#2124](https://github.com/github/codeql-action/pull/2124) ## 3.24.0 - 02 Feb 2024 From 3ab1d29793a7b28e33903fc553786c9ebdb816a3 Mon Sep 17 00:00:00 2001 From: Angela P Wen Date: Fri, 9 Feb 2024 11:31:14 -0800 Subject: [PATCH 3/3] Stop running debug artifacts checks on MacOS (#2123) --- .github/workflows/debug-artifacts-failure.yml | 42 +++++++-------- .github/workflows/debug-artifacts.yml | 51 +++++++------------ 2 files changed, 36 insertions(+), 57 deletions(-) diff --git a/.github/workflows/debug-artifacts-failure.yml b/.github/workflows/debug-artifacts-failure.yml index 50c84f6f1e..de10d98992 100644 --- a/.github/workflows/debug-artifacts-failure.yml +++ b/.github/workflows/debug-artifacts-failure.yml @@ -20,15 +20,12 @@ on: workflow_dispatch: {} jobs: upload-artifacts: - strategy: - matrix: - os: [ubuntu-latest, macos-latest] name: Upload debug artifacts after failure in analyze continue-on-error: true env: CODEQL_ACTION_TEST_MODE: true timeout-minutes: 45 - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest steps: - name: Dump GitHub event run: cat "${GITHUB_EVENT_PATH}" @@ -67,27 +64,24 @@ jobs: - name: Check expected artifacts exist shell: bash run: | - OPERATING_SYSTEMS="ubuntu-latest macos-latest" LANGUAGES="cpp csharp go java javascript python" - for os in $OPERATING_SYSTEMS; do - pushd "./my-debug-artifacts-$os" - echo "Artifacts from run on $os:" - for language in $LANGUAGES; do - echo "- Checking $language" - if [[ ! -f "my-db-$language-partial.zip" ]] ; then - echo "Missing a partial database bundle for $language" - exit 1 - fi - if [[ ! -d "log" ]] ; then - echo "Missing database initialization logs" - exit 1 - fi - if [[ ! "$language" == "go" ]] && [[ ! -d "$language/log" ]] ; then - echo "Missing logs for $language" - exit 1 - fi - done - popd + pushd "./my-debug-artifacts" + echo "Artifacts from run:" + for language in $LANGUAGES; do + echo "- Checking $language" + if [[ ! -f "my-db-$language-partial.zip" ]] ; then + echo "Missing a partial database bundle for $language" + exit 1 + fi + if [[ ! -d "log" ]] ; then + echo "Missing database initialization logs" + exit 1 + fi + if [[ ! "$language" == "go" ]] && [[ ! -d "$language/log" ]] ; then + echo "Missing logs for $language" + exit 1 + fi done + popd env: GO111MODULE: auto diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml index 53d53ed608..a10ca211c3 100644 --- a/.github/workflows/debug-artifacts.yml +++ b/.github/workflows/debug-artifacts.yml @@ -21,9 +21,6 @@ jobs: upload-artifacts: strategy: matrix: - os: - - ubuntu-latest - - macos-latest version: - stable-20221211 - stable-20230418 @@ -36,7 +33,7 @@ jobs: env: CODEQL_ACTION_TEST_MODE: true timeout-minutes: 45 - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest steps: - name: Check out repository uses: actions/checkout@v4 @@ -48,16 +45,6 @@ jobs: - uses: actions/setup-go@v5 with: go-version: ^1.13.1 - - name: Setup Python on MacOS - uses: actions/setup-python@v5 - if: | - matrix.os == 'macos-latest' && ( - matrix.version == 'stable-20221211' || - matrix.version == 'stable-20230418' || - matrix.version == 'stable-v2.13.5' || - matrix.version == 'stable-v2.14.6') - with: - python-version: '3.11' - uses: ./../action/init id: init with: @@ -87,26 +74,24 @@ jobs: VERSIONS="stable-20221211 stable-20230418 stable-v2.13.5 stable-v2.14.6 default latest nightly-latest" LANGUAGES="cpp csharp go java javascript python" for version in $VERSIONS; do - for os in ubuntu-latest macos-latest; do - pushd "./my-debug-artifacts-$os-${version//./}" - echo "Artifacts from version $version on $os:" - for language in $LANGUAGES; do - echo "- Checking $language" - if [[ ! -f "$language.sarif" ]] ; then - echo "Missing a SARIF file for $language" - exit 1 - fi - if [[ ! -f "my-db-$language.zip" ]] ; then - echo "Missing a database bundle for $language" - exit 1 - fi - if [[ ! -d "$language/log" ]] ; then - echo "Missing logs for $language" - exit 1 - fi - done - popd + pushd "./my-debug-artifacts-${version//./}" + echo "Artifacts from version $version:" + for language in $LANGUAGES; do + echo "- Checking $language" + if [[ ! -f "$language.sarif" ]] ; then + echo "Missing a SARIF file for $language" + exit 1 + fi + if [[ ! -f "my-db-$language.zip" ]] ; then + echo "Missing a database bundle for $language" + exit 1 + fi + if [[ ! -d "$language/log" ]] ; then + echo "Missing logs for $language" + exit 1 + fi done + popd done env: GO111MODULE: auto