Skip to content

Commit c33cdd7

Browse files
authored
Merge branch 'main' into cklin/pr/2.8.3
2 parents 480ef76 + 761da7e commit c33cdd7

File tree

6 files changed

+27
-7
lines changed

6 files changed

+27
-7
lines changed

.github/workflows/update-supported-enterprise-server-versions.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66

77
jobs:
88
update-supported-enterprise-server-versions:
9+
name: Update Supported Enterprise Server Versions
910
timeout-minutes: 30
1011
runs-on: ubuntu-latest
1112
if: ${{ github.repository == 'github/codeql-action' }}

CONTRIBUTING.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Here are a few things you can do that will increase the likelihood of your pull
6363
1. The first step of releasing a new version of the `codeql-action` is running the "Update release branch" workflow.
6464
This workflow goes through the pull requests that have been merged to `main` since the last release, creates a changelog, then opens a pull request to merge the changes since the last release into the `v1` release branch.
6565

66-
A release is automatically started every Monday via a scheduled run of this workflow, however you can start a release manually by triggering a run via [workflow dispatch](https://github.com/github/codeql-action/actions/workflows/update-release-branch.yml).
66+
A release is automatically started every Monday via a scheduled run of this workflow, however you can start a release manually by triggering a run via [workflow dispatch](https://github.com/github/codeql-action/actions/workflows/update-release-branch.yml).
6767
1. The workflow run will open a pull request titled "Merge main into v1". Mark the pull request as [ready for review](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#marking-a-pull-request-as-ready-for-review) to trigger the PR checks.
6868
1. Review the checklist items in the pull request description.
6969
Once you've checked off all but the last of these, approve the PR and automerge it.
@@ -72,6 +72,25 @@ Here are a few things you can do that will increase the likelihood of your pull
7272

7373
Approve the mergeback PR and automerge it. Once the mergeback has been merged into main, the release is complete.
7474

75+
## Keeping the PR checks up to date (admin access required)
76+
77+
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. Managing these PR checks manually is time consuming and complex. Here is a semi-automated approach.
78+
79+
To regenerate the PR jobs for the action:
80+
81+
1. From a terminal, run the following commands (replace `SHA` with the sha of the commit whose checks you want to use, typically this should be the latest from `main`):
82+
83+
```sh
84+
SHA= ####
85+
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)]')"
86+
echo "{\"contexts\": ${CHECKS}}" > checks.json
87+
gh api -X "PATCH" repos/github/codeql-action/branches/main/protection/required_status_checks --input checks.json
88+
gh api -X "PATCH" repos/github/codeql-action/branches/v1/protection/required_status_checks --input checks.json
89+
````
90+
91+
2. Go to the [branch protection rules settings page](https://github.com/github/codeql-action/settings/branches) and validate that the rules have been updated.
92+
93+
7594
## Resources
7695

7796
- [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)

lib/config-utils.test.js

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

lib/util.js

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

src/config-utils.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,15 +1811,15 @@ test(
18111811
true,
18121812
undefined,
18131813
"security-extended",
1814-
"~0.0.2"
1814+
"~0.1.0"
18151815
);
18161816
test(
18171817
mlPoweredQueriesMacro,
18181818
"2.7.5",
18191819
true,
18201820
undefined,
18211821
"security-and-quality",
1822-
"~0.0.2"
1822+
"~0.1.0"
18231823
);
18241824
test(
18251825
mlPoweredQueriesMacro,

src/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ export function isGoodVersion(versionSpec: string) {
636636
*/
637637
export const ML_POWERED_JS_QUERIES_PACK: PackWithVersion = {
638638
packName: "codeql/javascript-experimental-atm-queries",
639-
version: "~0.0.2",
639+
version: "~0.1.0",
640640
};
641641

642642
/**

0 commit comments

Comments
 (0)