Skip to content

Commit df25046

Browse files
aeisenbergaeisenberg
authored
Merge branch 'main' into status-reports-are-not-critical
2 parents d55b0d0 + 43a8916 commit df25046

File tree

5 files changed

+45
-65
lines changed

5 files changed

+45
-65
lines changed

‎.github/workflows/debug-artifacts-failure.yml

+18-24
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,12 @@ on:
2020
workflow_dispatch: {}
2121
jobs:
2222
upload-artifacts:
23-
strategy:
24-
matrix:
25-
os: [ubuntu-latest, macos-latest]
2623
name: Upload debug artifacts after failure in analyze
2724
continue-on-error: true
2825
env:
2926
CODEQL_ACTION_TEST_MODE: true
3027
timeout-minutes: 45
31-
runs-on: ${{ matrix.os }}
28+
runs-on: ubuntu-latest
3229
steps:
3330
- name: Dump GitHub event
3431
run: cat "${GITHUB_EVENT_PATH}"
@@ -67,27 +64,24 @@ jobs:
6764
- name: Check expected artifacts exist
6865
shell: bash
6966
run: |
70-
OPERATING_SYSTEMS="ubuntu-latest macos-latest"
7167
LANGUAGES="cpp csharp go java javascript python"
72-
for os in $OPERATING_SYSTEMS; do
73-
pushd "./my-debug-artifacts-$os"
74-
echo "Artifacts from run on $os:"
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
89-
done
90-
popd
68+
pushd "./my-debug-artifacts"
69+
echo "Artifacts from run:"
70+
for language in $LANGUAGES; do
71+
echo "- Checking $language"
72+
if [[ ! -f "my-db-$language-partial.zip" ]] ; then
73+
echo "Missing a partial database bundle for $language"
74+
exit 1
75+
fi
76+
if [[ ! -d "log" ]] ; then
77+
echo "Missing database initialization logs"
78+
exit 1
79+
fi
80+
if [[ ! "$language" == "go" ]] && [[ ! -d "$language/log" ]] ; then
81+
echo "Missing logs for $language"
82+
exit 1
83+
fi
9184
done
85+
popd
9286
env:
9387
GO111MODULE: auto

‎.github/workflows/debug-artifacts.yml

+18-33
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ jobs:
2121
upload-artifacts:
2222
strategy:
2323
matrix:
24-
os:
25-
- ubuntu-latest
26-
- macos-latest
2724
version:
2825
- stable-20221211
2926
- stable-20230418
@@ -36,7 +33,7 @@ jobs:
3633
env:
3734
CODEQL_ACTION_TEST_MODE: true
3835
timeout-minutes: 45
39-
runs-on: ${{ matrix.os }}
36+
runs-on: ubuntu-latest
4037
steps:
4138
- name: Check out repository
4239
uses: actions/checkout@v4
@@ -48,16 +45,6 @@ jobs:
4845
- uses: actions/setup-go@v5
4946
with:
5047
go-version: ^1.13.1
51-
- name: Setup Python on MacOS
52-
uses: actions/setup-python@v5
53-
if: |
54-
matrix.os == 'macos-latest' && (
55-
matrix.version == 'stable-20221211' ||
56-
matrix.version == 'stable-20230418' ||
57-
matrix.version == 'stable-v2.13.5' ||
58-
matrix.version == 'stable-v2.14.6')
59-
with:
60-
python-version: '3.11'
6148
- uses: ./../action/init
6249
id: init
6350
with:
@@ -87,26 +74,24 @@ jobs:
8774
VERSIONS="stable-20221211 stable-20230418 stable-v2.13.5 stable-v2.14.6 default latest nightly-latest"
8875
LANGUAGES="cpp csharp go java javascript python"
8976
for version in $VERSIONS; do
90-
for os in ubuntu-latest macos-latest; do
91-
pushd "./my-debug-artifacts-$os-${version//./}"
92-
echo "Artifacts from version $version on $os:"
93-
for language in $LANGUAGES; do
94-
echo "- Checking $language"
95-
if [[ ! -f "$language.sarif" ]] ; then
96-
echo "Missing a SARIF file for $language"
97-
exit 1
98-
fi
99-
if [[ ! -f "my-db-$language.zip" ]] ; then
100-
echo "Missing a database bundle for $language"
101-
exit 1
102-
fi
103-
if [[ ! -d "$language/log" ]] ; then
104-
echo "Missing logs for $language"
105-
exit 1
106-
fi
107-
done
108-
popd
77+
pushd "./my-debug-artifacts-${version//./}"
78+
echo "Artifacts from version $version:"
79+
for language in $LANGUAGES; do
80+
echo "- Checking $language"
81+
if [[ ! -f "$language.sarif" ]] ; then
82+
echo "Missing a SARIF file for $language"
83+
exit 1
84+
fi
85+
if [[ ! -f "my-db-$language.zip" ]] ; then
86+
echo "Missing a database bundle for $language"
87+
exit 1
88+
fi
89+
if [[ ! -d "$language/log" ]] ; then
90+
echo "Missing logs for $language"
91+
exit 1
92+
fi
10993
done
94+
popd
11095
done
11196
env:
11297
GO111MODULE: auto

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
77
## [UNRELEASED]
88

99
- The CodeQL action no longer fails if it can't write to the telemetry api endpoint. [#2121](https://github.com/github/codeql-action/pull/2121)
10+
- Update default CodeQL bundle version to 2.16.2. [#2124](https://github.com/github/codeql-action/pull/2124)
1011

1112
## 3.24.0 - 02 Feb 2024
1213

‎lib/defaults.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-v2.16.1",
3-
"cliVersion": "2.16.1",
4-
"priorBundleVersion": "codeql-bundle-v2.16.0",
5-
"priorCliVersion": "2.16.0"
2+
"bundleVersion": "codeql-bundle-v2.16.2",
3+
"cliVersion": "2.16.2",
4+
"priorBundleVersion": "codeql-bundle-v2.16.1",
5+
"priorCliVersion": "2.16.1"
66
}

‎src/defaults.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-v2.16.1",
3-
"cliVersion": "2.16.1",
4-
"priorBundleVersion": "codeql-bundle-v2.16.0",
5-
"priorCliVersion": "2.16.0"
2+
"bundleVersion": "codeql-bundle-v2.16.2",
3+
"cliVersion": "2.16.2",
4+
"priorBundleVersion": "codeql-bundle-v2.16.1",
5+
"priorCliVersion": "2.16.1"
66
}

0 commit comments

Comments
 (0)