Merge main into v2 by github-actions[bot] · Pull Request #1004 · github/codeql-action · GitHub

Merging bfe9e81 into v2

Conductor for this PR is @edoardopirovano

Contains the following pull requests:

Use the checkout_path for getting the commit oid #956 - Use the checkout_path for getting the commit oid (@aeisenberg)
Bump timeout to 45 minutes #976 - Bump timeout to 45 minutes (@aeisenberg)
Mergeback v1.1.5 refs/heads/v1 into main #983 - Mergeback v1.1.5 refs/heads/v1 into main (@cklin)
Update supported GitHub Enterprise Server versions. #984 - Update supported GitHub Enterprise Server versions. (@henrymercer)
Include CodeQL CLI and action versions in status reports #987 - Include CodeQL CLI and action versions in status reports (@cklin)
refactor: replace deprecated String.prototype.substr() #988 - refactor: replace deprecated String.prototype.substr() (@henrymercer)
Update README now build tracing is compatible with Windows 2022 #989 - Update README now build tracing is compatible with Windows 2022 (@henrymercer)
Bump default CodeQL version to 2.8.4 #990 - Bump default CodeQL version to 2.8.4 (@edoardopirovano)
Status reporting: fix codeql_version field name #992 - Status reporting: fix codeql_version field name (@cklin)
Bump minimist from 1.2.5 to 1.2.6 #993 - Bump minimist from 1.2.5 to 1.2.6 (@henrymercer)
Update release process to maintain both v2 and v1 releases #995 - Update release process to maintain both v2 and v1 releases (@henrymercer)
Fix python_setup/install_tool.sh when python2 not present #997 - Fix python_setup/install_tool.sh when python2 not present (@edoardopirovano)
Don't download packs when it isn't needed #998 - Don't download packs when it isn't needed (@edoardopirovano)
Start running ATM queries again #999 - Start running ATM queries again (@edoardopirovano)
Run Actions on Node 16 #1000 - Run Actions on Node 16 (@henrymercer)
Add PR check to validate compatibility with Node 12 #1001 - Add PR check to validate compatibility with Node 12 (@henrymercer)
Update changelog rewriting step to match v2+ only changelog notes #1002 - Update changelog rewriting step to match v2+ only changelog notes (@henrymercer)
Fix typos in release workflow #1003 - Fix typos in release workflow (@edoardopirovano)

Please review the following:

The CHANGELOG displays the correct version and date.
The CHANGELOG includes all relevant, user-facing changes since the last release.
There are no unexpected commits being merged into the v2 branch.
The docs team is aware of any documentation changes that need to be released.
The mergeback PR is merged back into main after this PR is merged.
The v1 release PR is merged after this PR is merged.

This commit also adds a new integration check to verify this. When running in test mode, payloads will not be uploaded. Instead, they will be saved to disk so that they can be inspected later.

With a 30 minute timeout, we were getting some cancelled runs. This should fix it.

Mergeback v1.1.5 refs/heads/v1 into main

Include CodeQL CLI and action versions in status reports

.substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated Signed-off-by: Tobias Speicher <rootcommander@gmail.com>

refactor: replace deprecated String.prototype.substr()

…r-versions Update supported GitHub Enterprise Server versions.

Update README now build tracing is compatible with Windows 2022

Status reporting: fix codeql_version field name

Bump timeout to 45 minutes

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>

Start running ATM queries again

Fix python_setup/install_tool.sh when `python2` not present

Run Actions on Node 16

…de-12-build Add PR check to validate compatibility with Node 12

…riting Update changelog rewriting step to match v2+ only changelog notes

Bump default CodeQL version to 2.8.4

Fix typos in release workflow

aeisenberg and others added 30 commits March 1, 2022 12:40

Use the checkout_path for getting the commit oid

a92e877

This commit also adds a new integration check to verify this. When running in test mode, payloads will not be uploaded. Instead, they will be saved to disk so that they can be inspected later.

Merge branch 'main' into aeisenberg/checkout-path-commitoid

5c2600e

Bump timeout to 45 minutes

76c3e91

With a 30 minute timeout, we were getting some cancelled runs. This should fix it.

Update changelog and version after v1.1.5

1457c16

1.1.6

ac7bd44

Update checked-in dependencies

34905f6

Merge pull request #983 from github/mergeback/v1.1.5-to-main-88347664

d0ee2b4

Mergeback v1.1.5 refs/heads/v1 into main

Include CodeQL CLI and action versions in status reports

f60bb5c

Merge pull request #987 from cklin/report-versions

3886398

Include CodeQL CLI and action versions in status reports

Update supported GitHub Enterprise Server versions.

243ebf6

refactor: replace deprecated String.prototype.substr()

0a71301

.substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated Signed-off-by: Tobias Speicher <rootcommander@gmail.com>

Merge pull request #988 from CommanderRoot/refactor/rm-deprecated-substr

f71aeef

refactor: replace deprecated String.prototype.substr()

Merge branch 'main' into update-supported-enterprise-server-versions

c592f89

Merge pull request #984 from github/update-supported-enterprise-serve…

1d81ec4

…r-versions Update supported GitHub Enterprise Server versions.

Update README now build tracing is compatible with Windows 2022

6de8537

Merge branch 'main' into aeisenberg/timeout-45-min

5d72058

Merge pull request #989 from github/henrymercer/update-readme

81bfc28

Update README now build tracing is compatible with Windows 2022

Status reporting: fix codeql_version field name

c3010cb

Merge pull request #992 from cklin/fix-codeql-version-field

c9973ef

Status reporting: fix codeql_version field name

Merge branch 'main' into aeisenberg/timeout-45-min

686c3a3

Merge pull request #976 from aeisenberg/aeisenberg/timeout-45-min

b887a2c

Bump timeout to 45 minutes

Update checked-in dependencies

ca5ed24

Remove unused repository_dispatch trigger

2a7a517

Parameterize release branch workflow over source and target branches

b386fd4

Use the person triggering the release workflow as the conductor

81827d3

Handle missing author information when generating changelog

ccda44c

Set up main -> v2, v2 -> v1, and v2 -> main merges

33f749f

Add functionality for v2 -> v1 backports

d76b182

Dump environment and GitHub context

4b465cb

henrymercer and others added 20 commits March 28, 2022 16:39

Add changelog note

9a709c1

Add PR check to validate compatibility with Node 12

45b96c3

Improve code comments

9e40359

Merge pull request #999 from github/edoardo/reenable-atm

0ed0799

Start running ATM queries again

Merge branch 'main' into python2-fix

63b2636

Add v2 only prefix to changelog note

01c7223

Merge branch 'main' into henrymercer/bump-node-js-to-v16

c22162c

Merge pull request #997 from cdivitotawela/python2-fix

fdc2a90

Fix python_setup/install_tool.sh when `python2` not present

Merge branch 'main' into henrymercer/bump-node-js-to-v16

eea7cf1

Merge pull request #1000 from github/henrymercer/bump-node-js-to-v16

8237e85

Run Actions on Node 16

Use git add --all .

2f4dd4b

Merge branch 'main' into henrymercer/pr-check-validate-node-12-build

73ba7ff

Merge pull request #1001 from github/henrymercer/pr-check-validate-no…

f0e2f3c

…de-12-build Add PR check to validate compatibility with Node 12

Update changelog rewriting step to match v2+ only release notes

282b607

Merge pull request #1002 from github/henrymercer/update-changelog-rew…

af34c6d

…riting Update changelog rewriting step to match v2+ only changelog notes

Bump default CodeQL version to 2.8.4

f1060fb

Merge pull request #990 from github/edoardo/2.8.4-bump

d8576e3

Bump default CodeQL version to 2.8.4

Fix typos in release workflow

1d58cc1

Merge pull request #1003 from github/edoardo/fix-workflow

bfe9e81

Fix typos in release workflow

Update changelog for v2.1.6

8833977

github-actions Bot assigned edoardopirovano Mar 30, 2022

edoardopirovano marked this pull request as ready for review March 30, 2022 10:03

edoardopirovano requested a review from a team as a code owner March 30, 2022 10:03

Fix location of changelog entry

34a1681

edoardopirovano approved these changes Mar 30, 2022

View reviewed changes

Run workflow also on v2 branch

a4da970

henrymercer approved these changes Mar 30, 2022

View reviewed changes

edoardopirovano merged commit 28eead2 into v2 Mar 30, 2022

edoardopirovano deleted the update-v2.1.6-bfe9e810 branch March 30, 2022 11:12

github-actions Bot mentioned this pull request Mar 30, 2022

Merge v2 into v1 #1006

Merged

4 tasks

Merge main into v2 by github-actions[bot] · Pull Request #1004 · github/codeql-action · GitHub

Uh oh!

Merge main into v2 - #1004

Merge main into v2#1004
edoardopirovano merged 79 commits into
v2from
update-v2.1.6-bfe9e810

github-actions Bot commented Mar 30, 2022 •
edited by edoardopirovano
Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Merge main into v2 by github-actions[bot] · Pull Request #1004 · github/codeql-action · GitHub

Uh oh!

Merge main into v2 - #1004

Merge main into v2#1004edoardopirovano merged 79 commits intov2github/codeql-action:v2from update-v2.1.6-bfe9e810github/codeql-action:update-v2.1.6-bfe9e810Copy head branch name to clipboard

Conversation

github-actions Bot commented Mar 30, 2022 • edited by edoardopirovano Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Merge main into v2#1004
edoardopirovano merged 79 commits into
v2from
update-v2.1.6-bfe9e810

github-actions Bot commented Mar 30, 2022 •
edited by edoardopirovano
Loading