Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 303c0ae

Browse files
igfooigfoo
authored
Merge pull request #3149 from github/update-v3.30.4-e4b85ab65
Merge main into releases/v3
2 parents 192325c + 333a673 commit 303c0ae

File tree

179 files changed

+7654
-2572
lines changed

Some content is hidden

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

179 files changed

+7654
-2572
lines changed

‎.github/actions/check-codescanning-config/index.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ import * as assert from 'assert'
66

77
const actualConfig = loadActualConfig()
88

9+
function sortConfigArrays(config) {
10+
for (const key of Object.keys(config)) {
11+
const value = config[key];
12+
if (key === 'queries' && Array.isArray(value)) {
13+
config[key] = value.sort();
14+
}
15+
}
16+
return config;
17+
}
18+
919
const rawExpectedConfig = process.argv[3].trim()
1020
if (!rawExpectedConfig) {
1121
core.setFailed('No expected configuration provided')
@@ -18,8 +28,8 @@ if (!rawExpectedConfig) {
1828
const expectedConfig = rawExpectedConfig ? JSON.parse(rawExpectedConfig) : undefined;
1929

2030
assert.deepStrictEqual(
21-
actualConfig,
22-
expectedConfig,
31+
sortConfigArrays(actualConfig),
32+
sortConfigArrays(expectedConfig),
2333
'Expected configuration does not match actual configuration'
2434
);
2535

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

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "Prepare test"
22
description: Performs some preparation to run tests
33
inputs:
44
version:
5-
description: "The version of the CodeQL CLI to use. Can be 'linked', 'default', 'nightly-latest', 'nightly-YYYYMMDD', or 'stable-vX.Y.Z"
5+
description: "The version of the CodeQL CLI to use. Can be 'linked', 'default', 'nightly', 'nightly-latest', 'nightly-YYYYMMDD', or 'stable-vX.Y.Z"
66
required: true
77
use-all-platform-bundle:
88
description: "If true, we output a tools URL with codeql-bundle.tar.gz file rather than platform-specific URL"
@@ -35,37 +35,31 @@ runs:
3535
run: |
3636
set -e # Fail this Action if `gh release list` fails.
3737
38-
if [[ "$VERSION" == "linked" ]]; then
38+
if [[ "$VERSION" == "nightly" || "$VERSION" == "nightly-latest" ]]; then
39+
echo "tools-url=nightly" >> "$GITHUB_OUTPUT"
40+
exit 0
41+
elif [[ "$VERSION" == "linked" ]]; then
3942
echo "tools-url=linked" >> "$GITHUB_OUTPUT"
4043
exit 0
4144
elif [[ "$VERSION" == "default" ]]; then
4245
echo "tools-url=" >> "$GITHUB_OUTPUT"
4346
exit 0
4447
fi
4548
46-
if [[ "$VERSION" == "nightly-latest" && "$RUNNER_OS" != "Windows" ]]; then
47-
extension="tar.zst"
48-
else
49-
extension="tar.gz"
50-
fi
51-
5249
if [[ "$USE_ALL_PLATFORM_BUNDLE" == "true" ]]; then
53-
artifact_name="codeql-bundle.$extension"
50+
artifact_name="codeql-bundle.tar.gz"
5451
elif [[ "$RUNNER_OS" == "Linux" ]]; then
55-
artifact_name="codeql-bundle-linux64.$extension"
52+
artifact_name="codeql-bundle-linux64.tar.gz"
5653
elif [[ "$RUNNER_OS" == "macOS" ]]; then
57-
artifact_name="codeql-bundle-osx64.$extension"
54+
artifact_name="codeql-bundle-osx64.tar.gz"
5855
elif [[ "$RUNNER_OS" == "Windows" ]]; then
59-
artifact_name="codeql-bundle-win64.$extension"
56+
artifact_name="codeql-bundle-win64.tar.gz"
6057
else
6158
echo "::error::Unrecognized OS $RUNNER_OS"
6259
exit 1
6360
fi
6461
65-
if [[ "$VERSION" == "nightly-latest" ]]; then
66-
tag=`gh release list --repo dsp-testing/codeql-cli-nightlies -L 1 | cut -f 3`
67-
echo "tools-url=https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/$tag/$artifact_name" >> $GITHUB_OUTPUT
68-
elif [[ "$VERSION" == *"nightly"* ]]; then
62+
if [[ "$VERSION" == *"nightly"* ]]; then
6963
version=`echo "$VERSION" | sed -e 's/^.*\-//'`
7064
echo "tools-url=https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/codeql-bundle-$version/$artifact_name" >> $GITHUB_OUTPUT
7165
elif [[ "$VERSION" == *"stable"* ]]; then

‎.github/codeql/codeql-actions-config.yml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.github/codeql/codeql-config.yml‎ renamed to ‎.github/codeql/codeql-config-javascript.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ queries:
77
# we include both even though one is a superset of the
88
# other, because we're testing the parsing logic and
99
# that the suites exist in the codeql bundle.
10+
- uses: security-and-quality
1011
- uses: security-experimental
1112
- uses: security-extended
12-
- uses: security-and-quality
1313
paths-ignore:
14-
- tests
1514
- lib
15+
- tests

‎.github/dependabot.yml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,14 @@ updates:
2020
patterns:
2121
- "*"
2222
- package-ecosystem: github-actions
23-
directory: "/"
23+
directories:
24+
- "/.github/workflows"
25+
- "/.github/actions"
2426
schedule:
2527
interval: weekly
28+
labels:
29+
- Rebuild
2630
groups:
2731
actions:
2832
patterns:
2933
- "*"
30-
- package-ecosystem: github-actions
31-
directory: "/.github/actions/setup-swift/" # All subdirectories outside of "/.github/workflows" must be explicitly included.
32-
schedule:
33-
interval: weekly
34-
groups:
35-
actions-setup-swift:
36-
patterns:
37-
- "*"

‎.github/workflows/__all-platform-bundle.yml‎

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

‎.github/workflows/__analyze-ref-input.yml‎

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

‎.github/workflows/__autobuild-action.yml‎

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

‎.github/workflows/__autobuild-direct-tracing-with-working-dir.yml‎

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

‎.github/workflows/__autobuild-direct-tracing.yml‎

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

0 commit comments

Comments
 (0)