8000 Merge branch 'main' into aeisenberg/qlconfig-in-cli · github/codeql-action@8f19113 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8f19113

Browse files
aeisenbergaeisenberg
committed
Merge branch 'main' into aeisenberg/qlconfig-in-cli
2 parents 736263f + 237a258 commit 8f19113

29 files changed

+510
-133
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ fi
1010
# When updating this, make sure to update the npm version in
1111
# `.github/workflows/update-dependencies.yml` too.
1212
sudo npm install --force -g npm@9.2.0
13+
14+
# clean the npm cache to ensure we don't have any files owned by root
15+
sudo npm cache clean --force
16+
1317
# Reinstall modules and then clean to remove absolute paths
1418
# Use 'npm ci' instead of 'npm install' as this is intended to be reproducible
1519
npm ci

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## [UNRELEASED]
44

5+
- Update default CodeQL bundle version to 2.12.3. [#1543](https://github.com/github/codeql-action/pull/1543)
6+
7+
## 2.2.4 - 10 Feb 2023
8+
59
No user facing changes.
610

711
## 2.2.3 - 08 Feb 2023

‎CONTRIBUTING.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,8 @@ Here are a few things you can do that will increase the likelihood of your pull
6767
This mergeback incorporates the changelog updates into `main`, tags the release using the merge commit of the "Merge main into releases/v2" pull request, and bumps the patch version of the CodeQL Action.
6868

6969
Approve the mergeback PR and automerge it.
70-
1. When the "Merge main into releases/v2" pull request is merged into the `releases/v2` branch, the "Update release branch" workflow will create a "Merge releases/v2 into releases/v1" pull request to merge the changes since the last release into the `releases/v1` release branch.
71-
This ensures we keep both the `releases/v1` and `releases/v2` release branches up to date and fully supported.
7270

73-
Review the checklist items in the pull request description.
74-
Once you've checked off all the items, approve the PR and automerge it.
75-
1. Once the mergeback has been merged to `main` and the "Merge releases/v2 into releases/v1" PR has been merged to `releases/v1`, the release is complete.
71+
Once the mergeback has been merged to `main`, the release is complete.
7672

7773
## Keeping the PR checks up to date (admin access required)
7874

‎lib/analyze.js

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

‎lib/analyze.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/analyze.test.js

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

0 commit comments

Comments
 (0)
0