diff --git a/.github/actions/setup-swift/action.yml b/.github/actions/setup-swift/action.yml index 74355b1586..c35f798209 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e4d144b5c..78d9a61f99 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 diff --git a/lib/defaults.json b/lib/defaults.json index 977a88f963..0314f5c13c 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 52ce5f7957..5ccbf00d85 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" }