Skip to content

Commit dcf2d0d

Browse files
authored
Merge branch 'main' into oscarsj-patch-1
2 parents 1b7bc48 + e9987ad commit dcf2d0d

File tree

402 files changed

+26633
-1247
lines changed

Some content is hidden

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

402 files changed

+26633
-1247
lines changed
+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Configuration for the CodeQL Actions Queries
2+
name: "CodeQL Actions Queries config"
3+
queries:
4+
- uses: security-and-quality

.github/workflows/codeql.yml

+26-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
echo "Suggested matrix config for analysis job: $VERSIONS_JSON"
7171
echo "versions=${VERSIONS_JSON}" >> $GITHUB_OUTPUT
7272
73-
build:
73+
analyze-javascript:
7474
needs: [check-codeql-versions]
7575
strategy:
7676
fail-fast: false
@@ -81,7 +81,7 @@ jobs:
8181

8282
permissions:
8383
contents: read
84-
security-events: write # needed to upload results
84+
security-events: write
8585

8686
steps:
8787
- name: Checkout
@@ -100,3 +100,27 @@ jobs:
100100
uses: ./analyze
101101
with:
102102
category: "/language:javascript"
103+
104+
105+
analyze-actions:
106+
runs-on: ubuntu-latest
107+
108+
strategy:
109+
fail-fast: false
110+
111+
permissions:
112+
contents: read
113+
security-events: write
114+
115+
steps:
116+
- name: Checkout
117+
uses: actions/checkout@v4
118+
- name: Initialize CodeQL
119+
uses: ./init
120+
with:
121+
languages: actions
122+
config-file: ./.github/codeql/codeql-actions-config.yml
123+
- name: Perform CodeQL Analysis
124+
uses: ./analyze
125+
with:
126+
category: "/language:actions"

.github/workflows/debug-artifacts-failure.yml renamed to .github/workflows/debug-artifacts-failure-safe.yml

+28-17
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ on:
1919
workflow_dispatch: {}
2020
jobs:
2121
upload-artifacts:
22+
strategy:
23+
fail-fast: false
24+
matrix:
25+
version:
26+
- stable-v2.20.3
27+
- default
28+
- linked
29+
- nightly-latest
2230
name: Upload debug artifacts after failure in analyze
2331
continue-on-error: true
2432
env:
@@ -36,7 +44,7 @@ jobs:
3644
id: prepare-test
3745
uses: ./.github/actions/prepare-test
3846
with:
39-
version: linked
47+
version: ${{ matrix.version }}
4048
- uses: actions/setup-go@v5
4149
with:
4250
go-version: ^1.13.1
@@ -70,22 +78,25 @@ jobs:
7078
shell: bash
7179
run: |
7280
LANGUAGES="cpp csharp go java javascript python"
73-
cd "./my-debug-artifacts"
74-
echo "Artifacts from run:"
75-
for language in $LANGUAGES; do
76-
echo "- Checking $language"
77-
if [[ ! -f "my-db-$language-partial.zip" ]] ; then
78-
echo "Missing a partial database bundle for $language"
79-
exit 1
80-
fi
81-
if [[ ! -d "log" ]] ; then
82-
echo "Missing database initialization logs"
83-
exit 1
84-
fi
85-
if [[ ! "$language" == "go" ]] && [[ ! -d "$language/log" ]] ; then
86-
echo "Missing logs for $language"
87-
exit 1
88-
fi
81+
for version in $VERSIONS; do
82+
echo "Artifacts from version $version:"
83+
pushd "./my-debug-artifacts-${version//./}"
84+
for language in $LANGUAGES; do
85+
echo "- Checking $language"
86+
if [[ ! -f "my-db-$language-partial.zip" ]] ; then
87+
echo "Missing a partial database bundle for $language"
88+
exit 1
89+
fi
90+
if [[ ! -d "log" ]] ; then
91+
echo "Missing database initialization logs"
92+
exit 1
93+
fi
94+
if [[ ! "$language" == "go" ]] && [[ ! -d "$language/log" ]] ; then
95+
echo "Missing logs for $language"
96+
exit 1
97+
fi
98+
done
99+
popd
89100
done
90101
env:
91102
GO111MODULE: auto

.github/workflows/debug-artifacts.yml renamed to .github/workflows/debug-artifacts-safe.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
version:
25-
- stable-v2.15.5
26-
- stable-v2.16.6
27-
- stable-v2.17.6
28-
- stable-v2.18.4
29-
- stable-v2.19.4
25+
- stable-v2.20.3
3026
- default
3127
- linked
3228
- nightly-latest
@@ -75,7 +71,7 @@ jobs:
7571
- name: Check expected artifacts exist
7672
shell: bash
7773
run: |
78-
VERSIONS="stable-v2.15.5 stable-v2.16.6 stable-v2.17.6 stable-v2.18.4 stable-v2.19.4 default linked nightly-latest"
74+
VERSIONS="stable-v2.20.3 default linked nightly-latest"
7975
LANGUAGES="cpp csharp go java javascript python"
8076
for version in $VERSIONS; do
8177
pushd "./my-debug-artifacts-${version//./}"

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

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929

3030
permissions:
3131
contents: write # needed to create tags and push commits
32+
pull-requests: write
3233

3334
steps:
3435
- name: Dump environment

CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
66

77
No user facing changes.
88

9+
## 3.28.8 - 29 Jan 2025
10+
11+
- Enable support for Kotlin 2.1.10 when running with CodeQL CLI v2.20.3. [#2744](https://github.com/github/codeql-action/pull/2744)
12+
13+
## 3.28.7 - 29 Jan 2025
14+
15+
No user facing changes.
16+
17+
## 3.28.6 - 27 Jan 2025
18+
19+
- Re-enable debug artifact upload for CLI versions 2.20.3 or greater. [#2726](https://github.com/github/codeql-action/pull/2726)
20+
921
## 3.28.5 - 24 Jan 2025
1022

1123
- Update default CodeQL bundle version to 2.20.3. [#2717](https://github.com/github/codeql-action/pull/2717)

lib/analyze-action-post.js

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/analyze-action-post.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/analyze-action.js

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/analyze-action.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/debug-artifacts.js

+15-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)