Skip to content

Commit 54a7f3b

Browse files
aeisenbergaeisenberg
authored
Merge branch 'main' into dbartol/remove-actions-extractor
2 parents 46fbf56 + 396fd27 commit 54a7f3b

File tree

893 files changed

+504408
-9355
lines changed

Some content is hidden

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

893 files changed

+504408
-9355
lines changed

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,27 @@ runs:
2929
- id: get-url
3030
name: Determine URL
3131
shell: bash
32+
env:
33+
VERSION: ${{ inputs.version }}
34+
USE_ALL_PLATFORM_BUNDLE: ${{ inputs.use-all-platform-bundle }}
3235
run: |
3336
set -e # Fail this Action if `gh release list` fails.
3437
35-
if [[ ${{ inputs.version }} == "linked" ]]; then
38+
if [[ "$VERSION" == "linked" ]]; then
3639
echo "tools-url=linked" >> "$GITHUB_OUTPUT"
3740
exit 0
38-
elif [[ ${{ inputs.version }} == "default" ]]; then
41+
elif [[ "$VERSION" == "default" ]]; then
3942
echo "tools-url=" >> "$GITHUB_OUTPUT"
4043
exit 0
4144
fi
4245
43-
if [[ ${{ inputs.version }} == "nightly-latest" && "$RUNNER_OS" != "Windows" ]]; then
46+
if [[ "$VERSION" == "nightly-latest" && "$RUNNER_OS" != "Windows" ]]; then
4447
extension="tar.zst"
4548
else
4649
extension="tar.gz"
4750
fi
4851
49-
if [[ ${{ inputs.use-all-platform-bundle }} == "true" ]]; then
52+
if [[ "$USE_ALL_PLATFORM_BUNDLE" == "true" ]]; then
5053
artifact_name="codeql-bundle.$extension"
5154
elif [[ "$RUNNER_OS" == "Linux" ]]; then
5255
artifact_name="codeql-bundle-linux64.$extension"
@@ -59,14 +62,14 @@ runs:
5962
exit 1
6063
fi
6164
62-
if [[ ${{ inputs.version }} == "nightly-latest" ]]; then
65+
if [[ "$VERSION" == "nightly-latest" ]]; then
6366
tag=`gh release list --repo dsp-testing/codeql-cli-nightlies -L 1 | cut -f 3`
6467
echo "tools-url=https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/$tag/$artifact_name" >> $GITHUB_OUTPUT
65-
elif [[ ${{ inputs.version }} == *"nightly"* ]]; then
66-
version=`echo ${{ inputs.version }} | sed -e 's/^.*\-//'`
68+
elif [[ "$VERSION" == *"nightly"* ]]; then
69+
version=`echo "$VERSION" | sed -e 's/^.*\-//'`
6770
echo "tools-url=https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/codeql-bundle-$version/$artifact_name" >> $GITHUB_OUTPUT
68-
elif [[ ${{ inputs.version }} == *"stable"* ]]; then
69-
version=`echo ${{ inputs.version }} | sed -e 's/^.*\-//'`
71+
elif [[ "$VERSION" == *"stable"* ]]; then
72+
version=`echo "$VERSION" | sed -e 's/^.*\-//'`
7073
echo "tools-url=https://github.com/github/codeql-action/releases/download/codeql-bundle-$version/$artifact_name" >> $GITHUB_OUTPUT
7174
else
7275
echo "::error::Unrecognized version specified!"

‎.github/actions/release-branches/action.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ runs:
1818
using: "composite"
1919
steps:
2020
- id: branches
21+
env:
22+
MAJOR_VERSION: ${{ inputs.major_version }}
23+
LATEST_TAG: ${{ inputs.latest_tag }}
2124
run: |
2225
python ${{ github.action_path }}/release-branches.py \
23-
--major-version ${{ inputs.major_version }} \
24-
--latest-tag ${{ inputs.latest_tag }}
26+
--major-version "$MAJOR_VERSION" \
27+
--latest-tag "$LATEST_TAG"
2528
shell: bash

‎.github/workflows/__rubocop-multi-language.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/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
strategy:
7676
fail-fast: false
7777
matrix:
78-
os: [ubuntu-20.04,ubuntu-22.04,windows-2019,windows-2022,macos-13,macos-14]
78+
os: [ubuntu-22.04,ubuntu-24.04,windows-2019,windows-2022,macos-13,macos-14]
7979
tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }}
8080
runs-on: ${{ matrix.os }}
8181

‎.github/workflows/codescanning-config-cli.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
name: Code-Scanning config CLI tests
44
env:
55
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6+
# Diff informed queries add an additional query filter which is not yet
7+
# taken into account by these tests.
8+
CODEQL_ACTION_DIFF_INFORMED_QUERIES: false
69

710
on:
811
push:

‎.github/workflows/post-release-mergeback.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
--draft
169169
170170
- name: Generate token
171-
uses: actions/create-github-app-token@v1.12.0
171+
uses: actions/create-github-app-token@v2.0.6
172172
id: app-token
173173
with:
174174
app-id: ${{ vars.AUTOMATION_APP_ID }}

‎.github/workflows/update-release-branch.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
pull-requests: write # needed to create pull request
125125
steps:
126126
- name: Generate token
127-
uses: actions/create-github-app-token@v1.12.0
127+
uses: actions/create-github-app-token@v2.0.6
128128
id: app-token
129129
with:
130130
app-id: ${{ vars.AUTOMATION_APP_ID }}

‎CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,28 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
99
your `tools:` property to a specific version of the CodeQL CLI earlier than v2.20.4, you will need to update to at least CodeQL v2.20.4 or disable
1010
`actions` analysis.
1111

12+
## 3.28.18 - 16 May 2025
13+
14+
- Update default CodeQL bundle version to 2.21.3. [#2893](https://github.com/github/codeql-action/pull/2893)
15+
- Skip validating SARIF produced by CodeQL for improved performance. [#2894](https://github.com/github/codeql-action/pull/2894)
16+
- The number of threads and amount of RAM used by CodeQL can now be set via the `CODEQL_THREADS` and `CODEQL_RAM` runner environment variables. If set, these environment variables override the `threads` and `ram` inputs respectively. [#2891](https://github.com/github/codeql-action/pull/2891)
17+
18+
## 3.28.17 - 02 May 2025
19+
20+
- Update default CodeQL bundle version to 2.21.2. [#2872](https://github.com/github/codeql-action/pull/2872)
21+
22+
## 3.28.16 - 23 Apr 2025
23+
24+
- Update default CodeQL bundle version to 2.21.1. [#2863](https://github.com/github/codeql-action/pull/2863)
25+
26+
## 3.28.15 - 07 Apr 2025
27+
28+
- Fix bug where the action would fail if it tried to produce a debug artifact with more than 65535 files. [#2842](https://github.com/github/codeql-action/pull/2842)
29+
30+
## 3.28.14 - 07 Apr 2025
31+
32+
- Update default CodeQL bundle version to 2.21.0. [#2838](https://github.com/github/codeql-action/pull/2838)
33+
1234
## 3.28.13 - 24 Mar 2025
1335

1436
No user facing changes.

‎README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,11 @@ We typically release new minor versions of the CodeQL Action and Bundle when a n
7070

7171
| Minimum CodeQL Action | Minimum CodeQL Bundle Version | GitHub Environment | Notes |
7272
|-----------------------|-------------------------------|--------------------|-------|
73-
| `v3.26.6` | `2.18.4` | Enterprise Server 3.15 | |
74-
| `v3.25.11` | `2.17.6` | Enterprise Server 3.14 | |
75-
| `v3.24.11` | `2.16.6` | Enterprise Server 3.13 | |
76-
| `v3.22.12` | `2.15.5` | Enterprise Server 3.12 | |
73+
| `v3.28.12` | `2.20.7` | Enterprise Server 3.17 | |
74+
| `v3.28.6` | `2.20.3` | Enterprise Server 3.16 | |
75+
| `v3.28.6` | `2.20.3` | Enterprise Server 3.15 | |
76+
| `v3.28.6` | `2.20.3` | Enterprise Server 3.14 | |
77+
| `v3.28.6` | `2.20.3` | Enterprise Server 3.13 | |
7778

7879
See the full list of GHES release and deprecation dates at [GitHub Enterprise Server releases](https://docs.github.com/en/enterprise-server/admin/all-releases#releases-of-github-enterprise-server).
7980

‎lib/analyze.js‎

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

0 commit comments

Comments
 (0)