From 793adb79acaacb05794a4e7cd40a96a606dc6e20 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 12:46:37 +0000 Subject: [PATCH 1/4] Update default bundle to codeql-bundle-v2.15.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 977a88f96..0314f5c13 100644 --- a/lib/defaults.json +++ b/lib/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.15.1", - "cliVersion": "2.15.1", - "priorBundleVersion": "codeql-bundle-v2.15.0", - "priorCliVersion": "2.15.0" + "bundleVersion": "codeql-bundle-v2.15.2", + "cliVersion": "2.15.2", + "priorBundleVersion": "codeql-bundle-v2.15.1", + "priorCliVersion": "2.15.1" } diff --git a/src/defaults.json b/src/defaults.json index 52ce5f795..5ccbf00d8 100644 --- a/src/defaults.json +++ b/src/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.15.1", - "cliVersion": "2.15.1", - "priorBundleVersion": "codeql-bundle-v2.15.0", - "priorCliVersion": "2.15.0" + "bundleVersion": "codeql-bundle-v2.15.2", + "cliVersion": "2.15.2", + "priorBundleVersion": "codeql-bundle-v2.15.1", + "priorCliVersion": "2.15.1" } From 45a6ff466080ea064fbc13693befd8fbb2863a0f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 12:46:42 +0000 Subject: [PATCH 2/4] Add changelog note --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e4d144b5..78d9a61f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th ## [UNRELEASED] -No user facing changes. +- Update default CodeQL bundle version to 2.15.2. [#1978](https://github.com/github/codeql-action/pull/1978) ## 2.22.5 - 27 Oct 2023 From 82284f1b28654cb1dcfe26b6c02e0636ee633a07 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Fri, 10 Nov 2023 13:19:40 -0800 Subject: [PATCH 3/4] Fix failing workflows Ensure that pythion 3.11 is used for older CLIs on windows. --- .github/workflows/debug-artifacts-failure.yml | 13 ++++++++++++- .github/workflows/debug-artifacts.yml | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.github/workflows/debug-artifacts-failure.yml b/.github/workflows/debug-artifacts-failure.yml index 41cc5e354..c15d92c00 100644 --- a/.github/workflows/debug-artifacts-failure.yml +++ b/.github/workflows/debug-artifacts-failure.yml @@ -42,6 +42,17 @@ jobs: - uses: actions/setup-go@v4 with: go-version: ^1.13.1 + - name: Setup Python on MacOS + uses: actions/setup-python@v4 + if: | + matrix.os == 'macos-latest' && ( + matrix.version == 'stable-20220908' || + 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 with: tools: ${{ steps.prepare-test.outputs.tools-url }} @@ -52,7 +63,7 @@ jobs: shell: bash run: ./build.sh - uses: ./../action/analyze - id: analysis + id: analysis with: expect-error: true ram: 1 diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml index 7bee24739..5ce95784c 100644 --- a/.github/workflows/debug-artifacts.yml +++ b/.github/workflows/debug-artifacts.yml @@ -49,6 +49,17 @@ jobs: - uses: actions/setup-go@v4 with: go-version: ^1.13.1 + - name: Setup Python on MacOS + uses: actions/setup-python@v4 + if: | + matrix.os == 'macos-latest' && ( + matrix.version == 'stable-20220908' || + 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: @@ -63,7 +74,7 @@ jobs: shell: bash run: ./build.sh - uses: ./../action/analyze - id: analysis + id: analysis download-and-check-artifacts: name: Download and check debug artifacts needs: upload-artifacts From 59252d9bfb0e66fde481d0102f2920f096385899 Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Mon, 13 Nov 2023 11:33:19 +0000 Subject: [PATCH 4/4] Update setup-swift deficiency compensation --- .github/actions/setup-swift/action.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup-swift/action.yml b/.github/actions/setup-swift/action.yml index 74355b158..c35f79820 100644 --- a/.github/actions/setup-swift/action.yml +++ b/.github/actions/setup-swift/action.yml @@ -24,9 +24,11 @@ runs: VERSION="5.7.0" elif [ $VERSION = "5.8" ]; then VERSION="5.8.0" - # setup-swift does not yet support v5.8.1 Remove this when it does. - elif [ $VERSION = "5.8.1" ]; then - VERSION="5.8.0" + elif [ $VERSION = "5.9" ]; then + VERSION="5.9.0" + # setup-swift does not yet support v5.9.1 Remove this when it does. + elif [ $VERSION = "5.9.1" ]; then + VERSION="5.9.0" fi fi echo "version=$VERSION" | tee -a $GITHUB_OUTPUT