10000 Merge pull request #1570 from github/update-v2.2.6-e12a2ecd4 · github/codeql-action@16964e9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 16964e9

Browse files
dbartoldbartol
authored
Merge pull request #1570 from github/update-v2.2.6-e12a2ecd4
Merge main into releases/v2
2 parents 32dc499 + 74cbab4 commit 16964e9

File tree

174 files changed

+22963
-3040
lines changed

Some content is hidden

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

174 files changed

+22963
-3040
lines changed

‎.github/codeql/codeql-config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ 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-experimental
1011
- uses: security-extended
1112
- uses: security-and-quality
1213
paths-ignore:

‎.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ updates:
1515
directory: "/"
1616
schedule:
1717
interval: weekly
18+
- package-ecosystem: github-actions
19+
directory: "/.github/setup-swift/" # All subdirectories outside of "/.github/workflows" must be explicitly included.
20+
schedule:
21+
interval: weekly

‎.github/setup-swift/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ runs:
2626
VERSION="5.7.0"
2727
fi
2828
echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
29-
- uses: swift-actions/setup-swift@194625b58a582570f61cc707c3b558086c26b723
29+
- uses: swift-actions/setup-swift@da0e3e04b5e3e15dbc3861bd835ad9f0afe56296 # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test.
3030
if: "(runner.os != 'Windows') && (matrix.version == 'cached' || matrix.version == 'latest' || matrix.version == 'nightly-latest')"
3131
with:
3232
swift-version: "${{steps.get_swift_version.outputs.version}}"

‎.github/workflows/__init-with-registries.yml

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

‎.github/workflows/script/check-node-modules.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,9 @@ if [ ! -z "$(git status --porcelain)" ]; then
77
>&2 echo "Failed: Repo should be clean before testing!"
88
exit 1
99
fi
10-
# When updating this, make sure to update the npm version in
11-
# `.github/workflows/update-dependencies.yml` too.
12-
sudo npm install --force -g npm@9.2.0
1310

14-
# clean the npm cache to ensure we don't have any files owned by root
15-
sudo npm cache clean --force
11+
"$(dirname "$0")/update-node-modules.sh" check-only
1612

17-
# Reinstall modules and then clean to remove absolute paths
18-
# Use 'npm ci' instead of 'npm install' as this is intended to be reproducible
19-
npm ci
20-
npm run removeNPMAbsolutePaths
2113
# Check that repo is still clean
2214
if [ ! -z "$(git status --porcelain)" ]; then
2315
# If we get a fail here then the PR needs attention

‎.github/workflows/script/update-node-modules.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
if [ "$1" != "update" && "$1" != "check-only" ]; then
2+
>&2 echo "Failed: Invalid argument. Must be 'update' or 'check-only'"
3+
exit 1
4+
fi
5+
6+
sudo npm install --force -g npm@9.2.0
7+
8+
# clean the npm cache to ensure we don't have any files owned by root
9+
sudo npm cache clean --force
10+
11+
if [ "$1" = "update" ]; then
12+
npm install
13+
fi
14+
15+
# Reinstall modules and then clean to remove absolute paths
16+
# Use 'npm ci' instead of 'npm install' as this is intended to be reproducible
17+
npm ci
18+
npm run removeNPMAbsolutePaths

‎.github/workflows/update-dependencies.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,7 @@ jobs:
2727
run: |
2828
git fetch origin "$BRANCH" --depth=1
2929
git checkout "origin/$BRANCH"
30-
# When updating this, make sure to update the npm version in
31-
# `.github/workflows/script/check-node-modules.sh` too.
32-
sudo npm install --force -g npm@9.2.0
33-
npm install
34-
npm ci
35-
npm run removeNPMAbsolutePaths
30+
.github/workflows/script/update-node-modules.sh update
3631
if [ ! -z "$(git status --porcelain)" ]; then
3732
git config --global user.email "github-actions@github.com"
3833
git config --global user.name "github-actions[bot]"

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CodeQL Action Changelog
22

3+
## 2.2.6 - 10 Mar 2023
4+
5+
- Update default CodeQL bundle version to 2.12.4.
6+
37
## 2.2.5 - 24 Feb 2023
48

59
- Update default CodeQL bundle version to 2.12.3. [#1543](https://github.com/github/codeql-action/pull/1543)

‎lib/codeql.js

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

‎lib/codeql.js.map

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

‎lib/codeql.test.js

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

‎lib/codeql.test.js.map

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

0 commit comments

Comments
 (0)
0