Skip to content

Commit f824adb

Browse files
authored
Merge branch 'main' into rvermeulen/update-release-branch-authz
2 parents 0f99b63 + 8fd294e commit f824adb

File tree

633 files changed

+9119
-3923
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

633 files changed

+9119
-3923
lines changed

.github/actions/prepare-test/action.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,20 @@ runs:
3232
run: |
3333
set -e # Fail this Action if `gh release list` fails.
3434
35+
if [[ ${{ inputs.version }} == "nightly-latest" ]]; then
36+
extension="tar.zst"
37+
else
38+
extension="tar.gz"
39+
fi
40+
3541
if [[ ${{ inputs.use-all-platform-bundle }} == "true" ]]; then
36-
artifact_name="codeql-bundle.tar.gz"
42+
artifact_name="codeql-bundle.$extension"
3743
elif [[ "$RUNNER_OS" == "Linux" ]]; then
38-
artifact_name="codeql-bundle-linux64.tar.gz"
44+
artifact_name="codeql-bundle-linux64.$extension"
3945
elif [[ "$RUNNER_OS" == "macOS" ]]; then
40-
artifact_name="codeql-bundle-osx64.tar.gz"
46+
artifact_name="codeql-bundle-osx64.$extension"
4147
elif [[ "$RUNNER_OS" == "Windows" ]]; then
42-
artifact_name="codeql-bundle-win64.tar.gz"
48+
artifact_name="codeql-bundle-win64.$extension"
4349
else
4450
echo "::error::Unrecognized OS $RUNNER_OS"
4551
exit 1

.github/actions/setup-swift/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ runs:
1111
id: get_swift_version
1212
if: runner.os == 'Linux'
1313
shell: bash
14-
env:
14+
env:
1515
CODEQL_PATH: ${{ inputs.codeql-path }}
1616
run: |
1717
SWIFT_EXTRACTOR_DIR="$("$CODEQL_PATH" resolve languages --format json | jq -r '.swift[0]')"
1818
if [ $SWIFT_EXTRACTOR_DIR = "null" ]; then
1919
VERSION="null"
2020
else
2121
VERSION="$("$SWIFT_EXTRACTOR_DIR/tools/linux64/extractor" --version | awk '/version/ { print $3 }')"
22-
# Specify 5.x.0, otherwise setup Action will default to latest minor version.
22+
# Specify 5.x.0, otherwise setup Action will default to latest minor version.
2323
if [ $VERSION = "5.7" ]; then
2424
VERSION="5.7.0"
2525
elif [ $VERSION = "5.8" ]; then
@@ -29,11 +29,11 @@ runs:
2929
# setup-swift does not yet support v5.9.1 Remove this when it does.
3030
elif [ $VERSION = "5.9.1" ]; then
3131
VERSION="5.9.0"
32-
fi
32+
fi
3333
fi
3434
echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
3535
36-
- uses: redsun82/setup-swift@b2b6f77ab14f6a9b136b520dc53ec8eca27d2b99 # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test.
36+
- uses: redsun82/setup-swift@362f49f31da2f5f4f851657046bdd1290d03edc8 # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test.
3737
if: runner.os == 'Linux' && steps.get_swift_version.outputs.version != 'null'
3838
with:
3939
swift-version: "${{ steps.get_swift_version.outputs.version }}"

.github/workflows/__go-tracing-autobuilder.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-tracing-custom-build-steps.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-tracing-legacy-workflow.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__job-run-uuid-sarif.yml

Lines changed: 84 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__submit-sarif-failure.yml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__test-local-codeql.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/script/update-required-checks.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ fi
2828
echo "Getting checks for $GITHUB_SHA"
2929

3030
# Ignore any checks with "https://", CodeQL, LGTM, and Update checks.
31-
# Also ignore the non-matrixed "Unit Tests" job that only runs on pushes to protected branches.
32-
CHECKS="$(gh api repos/github/codeql-action/commits/"${GITHUB_SHA}"/check-runs --paginate | jq --slurp --compact-output --raw-output '[.[].check_runs | .[].name | select(contains("https://") or . == "CodeQL" or . == "Dependabot" or . == "check-expected-release-files" or . == "Unit Tests" or contains("Update") or contains("update") or contains("test-setup-python-scripts") | not)] | unique | sort')"
31+
CHECKS="$(gh api repos/github/codeql-action/commits/"${GITHUB_SHA}"/check-runs --paginate | jq --slurp --compact-output --raw-output '[.[].check_runs.[] | select(.conclusion != "skipped") | .name | select(contains("https://") or . == "CodeQL" or . == "Dependabot" or . == "check-expected-release-files" or contains("Update") or contains("update") or contains("test-setup-python-scripts") | not)] | unique | sort')"
3332

3433
echo "$CHECKS" | jq
3534

CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,35 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
66

77
## [UNRELEASED]
88

9+
No user facing changes.
10+
11+
## 3.26.6 - 29 Aug 2024
12+
13+
- Update default CodeQL bundle version to 2.18.3. [#2449](https://github.com/github/codeql-action/pull/2449)
14+
15+
## 3.26.5 - 23 Aug 2024
16+
17+
- Fix an issue where the `csrutil` system call used for telemetry would fail on MacOS ARM machines with System Integrity Protection disabled. [#2441](https://github.com/github/codeql-action/pull/2441)
18+
19+
## 3.26.4 - 21 Aug 2024
20+
21+
- _Deprecation:_ The `add-snippets` input on the `analyze` Action is deprecated and will be removed in the first release in August 2025. [#2436](https://github.com/github/codeql-action/pull/2436)
22+
- Fix an issue where the disk usage system call used for telemetry would fail on MacOS ARM machines with System Integrity Protection disabled, and then surface a warning. The system call is now disabled for these machines. [#2434](https://github.com/github/codeql-action/pull/2434)
23+
24+
## 3.26.3 - 19 Aug 2024
25+
26+
- Fix an issue where the CodeQL Action could not write diagnostic messages on Windows. This issue did not impact analysis quality. [#2430](https://github.com/github/codeql-action/pull/2430)
27+
28+
## 3.26.2 - 14 Aug 2024
29+
30+
- Update default CodeQL bundle version to 2.18.2. [#2417](https://github.com/github/codeql-action/pull/2417)
31+
32+
## 3.26.1 - 13 Aug 2024
33+
34+
No user facing changes.
35+
36+
## 3.26.0 - 06 Aug 2024
37+
938
- _Deprecation:_ Swift analysis on Ubuntu runner images is no longer supported. Please migrate to a macOS runner if this affects you. [#2403](https://github.com/github/codeql-action/pull/2403)
1039
- Bump the minimum CodeQL bundle version to 2.13.5. [#2408](https://github.com/github/codeql-action/pull/2408)
1140

0 commit comments

Comments
 (0)