Skip to content

Commit a3a6c12

Browse files
Merge pull request #1078 from github/update-v2.1.11-657c2f3f
Merge main into releases/v2
2 parents 2f58583 + 657581e commit a3a6c12

Some content is hidden

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

77 files changed

+2383
-163
lines changed

.github/workflows/__ml-powered-queries.yml

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

CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
# CodeQL Action Changelog
22

3+
## 2.1.11 - 17 May 2022
4+
5+
- Update default CodeQL bundle version to 2.9.2. [#1074](https://github.com/github/codeql-action/pull/1074)
6+
37
## 2.1.10 - 10 May 2022
48

5-
- Update default CodeQL bundle version to 2.9.5. [#1056](https://github.com/github/codeql-action/pull/1056)
9+
- Update default CodeQL bundle version to 2.9.1. [#1056](https://github.com/github/codeql-action/pull/1056)
610
- When `wait-for-processing` is enabled, the workflow will now fail if there were any errors that occurred during processing of the analysis results.
711

812
## 2.1.9 - 27 Apr 2022

CONTRIBUTING.md

+4-16
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,11 @@ Here are a few things you can do that will increase the likelihood of your pull
8080

8181
## Keeping the PR checks up to date (admin access required)
8282

83-
Since the `codeql-action` runs most of its testing through individual Actions workflows, there are over two hundred jobs that need to pass in order for a PR to turn green. You can regenerate the checks automatically by running the [Update required checks](.github/workflows/update-required-checks.yml) workflow.
83+
Since the `codeql-action` runs most of its testing through individual Actions workflows, there are over two hundred jobs that need to pass in order for a PR to turn green. You can regenerate the checks automatically by running the [update-required-checks.sh](.github/workflows/script/update-required-checks.sh) script:
8484

85-
Or you can use this semi-automated approach:
86-
87-
1. In a terminal check out the `SHA` whose checks you want to use as the base. Typically, this will be `main`.
88-
2. From a terminal, run the following commands:
89-
90-
```sh
91-
SHA="$(git rev-parse HEAD)"
92-
CHECKS="$(gh api repos/github/codeql-action/commits/${SHA}/check-runs --paginate | jq --slurp --compact-output --raw-output '[.[].check_runs | .[].name | select(contains("https://") or . == "CodeQL" or . == "LGTM.com" or . == "Update dependencies" or . == "Update Supported Enterprise Server Versions" | not)]')"
93-
echo "{\"contexts\": ${CHECKS}}" > checks.json
94-
gh api -X "PATCH" repos/github/codeql-action/branches/main/protection/required_status_checks --input checks.json
95-
gh api -X "PATCH" repos/github/codeql-action/branches/releases/v2/protection/required_status_checks --input checks.json
96-
gh api -X "PATCH" repos/github/codeql-action/branches/releases/v1/protection/required_status_checks --input checks.json
97-
````
98-
99-
3. Go to the [branch protection rules settings page](https://github.com/github/codeql-action/settings/branches) and validate that the rules have been updated.
85+
1. By default, this script retrieves the checks from the latest SHA on `main`, so make sure that your `main` branch is up to date.
86+
2. Run the script. If there's a reason to, you can pass in a different SHA as a CLI argument.
87+
3. After running, go to the [branch protection rules settings page](https://github.com/github/codeql-action/settings/branches) and validate that the rules for `main`, `v1`, and `v2` have been updated.
10088

10189
## Resources
10290

lib/codeql.js

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

lib/codeql.js.map

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

lib/config-utils.js

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

lib/config-utils.js.map

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

lib/config-utils.test.js

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

lib/config-utils.test.js.map

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

lib/defaults.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"bundleVersion": "codeql-bundle-20220428"
2+
"bundleVersion": "codeql-bundle-20220512"
33
}

0 commit comments

Comments
 (0)