Merge main into v1 #965

github-actions · 2022-03-07T16:22:49Z

Merging 308528b into v1

Conductor for this PR is @aeisenberg

Contains the following pull requests:

Mergeback v1.1.3 refs/heads/v1 into main #947 - Mergeback v1.1.3 refs/heads/v1 into main (@aeisenberg)
Revert "Merge pull request #869 from github/edoardo/windows-11-error" #948 - Revert "Merge pull request Refuse to run on Windows 11 #869 from github/edoardo/windows-11-error" (@edoardopirovano)
Bump removeNPMAbsolutePaths from 2.0.0 to 3.0.0 #949 - Bump removeNPMAbsolutePaths from 2.0.0 to 3.0.0 (@henrymercer)
Update default CodeQL bundle version to 2.8.2 #950 - Update default CodeQL bundle version to 2.8.2 (@hmakholm)
Expand PR checks to cover windows-2022 #954 - Expand PR checks to cover windows-2022 (@edoardopirovano)
Delete the results directory in between runs. #955 - Delete the results directory in between runs. (@chrisgavin)
Second attempt to use --codescanning-config flag of CLI #957 - Second attempt to use --codescanning-config flag of CLI (@edoardopirovano)
Fix link to docs #958 - Fix link to docs (@aeisenberg)
Add runner OS and arch to status report #959 - Add runner OS and arch to status report (@cklin)
Bump @actions/artifact from 0.5.2 to 1.0.0 #961 - Bump @actions/artifact from 0.5.2 to 1.0.0 (@aeisenberg)

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 v1 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.

Mergeback v1.1.3 refs/heads/v1 into main

This reverts commit faa9ba7, reversing changes made to 71112ab.

Revert "Merge pull request #869 from github/edoardo/windows-11-error"

Bumps [removeNPMAbsolutePaths](https://github.com/juanjoDiaz/removeNPMAbsolutePaths) from 2.0.0 to 3.0.0. - [Release notes](https://github.com/juanjoDiaz/removeNPMAbsolutePaths/releases) - [Commits](juanjoDiaz/removeNPMAbsolutePaths@v2.0.0...v3.0.0) --- updated-dependencies: - dependency-name: removeNPMAbsolutePaths dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…AbsolutePaths-3.0.0 Bump removeNPMAbsolutePaths from 2.0.0 to 3.0.0

Update default CodeQL bundle version to 2.8.2

Co-authored-by: Andrew Eisenberg <[email protected]>

Delete the results directory in between runs.

Expand PR checks to cover `windows-2022`

This reverts commit 326e511.

Second attempt to use `--codescanning-config` flag of CLI

Co-authored-by: Andrew Eisenberg <[email protected]>

Bumps [@actions/artifact](https://github.com/actions/toolkit/tree/HEAD/packages/artifact) from 0.5.2 to 1.0.0. - [Release notes](https://github.com/actions/toolkit/releases) - [Changelog](https://github.com/actions/toolkit/blob/main/packages/artifact/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/@actions/[email protected]/packages/artifact) --- updated-dependencies: - dependency-name: "@actions/artifact" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…rtifact-1.0.0 Bump @actions/artifact from 0.5.2 to 1.0.0

Add runner OS and arch to status report

Fix link to docs

aeisenberg · 2022-03-07T16:37:02Z

@edoardopirovano Does #957 need a change note, or is it sufficiently internal?

aeisenberg · 2022-03-07T16:41:45Z

Also, #869 should probably have a change note. I think the action was alreade broken on windows 11, this just makes the error message more understandable. Maybe something like:

- Fail with a meaningful error message for Windows 11 and Windows Server 2022 which are currently unsupported. [#869](https://github.com/github/codeql-action/pull/869)

CHANGELOG.md

Co-authored-by: Andrew Eisenberg <[email protected]>

hmakholm · 2022-03-07T16:46:17Z

Also, #869 should probably have a change note. I think the action was alreade broken on windows 11, this just makes the error message more understandable.

Is this still relevant? The CLI changelog says it now ought to work on Windows 11.

@edoardopirovano Does #957 need a change note, or is it sufficiently internal?

Edoardo is on vacation this week. We'll have to make a decision in his absence.

CHANGELOG.md

edoardopirovano · 2022-03-07T16:54:24Z

@edoardopirovano Does #957 need a change note, or is it sufficiently internal?

I think since it shouldn't change anything from a user point of view it does not need a change note.

CHANGELOG.md

aeisenberg

After this goes in, lgtm.

Co-authored-by: Andrew Eisenberg <[email protected]>

adityasharad · 2022-03-07T17:38:35Z

CHANGELOG.md

+
+- Update default CodeQL bundle version to 2.8.2. [#950](https://github.com/github/codeql-action/pull/950)
+- Fix a bug where old results can be uploaded if the languages in a repository change when using a non-ephemeral self-hosted runner. [#955](https://github.com/github/codeql-action/pull/955)
+- Fail with a meaningful error message for Windows 11 and Windows Server 2022 which are currently unsupported. [#869](https://github.com/github/codeql-action/pull/869)


I think @hmakholm's earlier comment is correct: 2.8.2 introduces support for Windows 11, so we should instead highlight that (or reference the 2.8.2 change notes). @criemen to confirm.

Also if I'm reading the generated PR summary correctly, this mergeback PR does not contain #869; it contains #948 which is the revert of #869.

Thanks. My mistake.

I can confirm 2.8.2 introduces W11 support.
I don't think this should go in the action changelog, as the action now just delegates to the CLI about W11 supports presence/absence, and that's mainly controlled by what's in the toolcache.

CHANGELOG.md

Suggestion taken, PR changed.

github-actions[bot] and others added 30 commits February 23, 2022 19:33

Update changelog and version after v1.1.3

507795f

1.1.4

949eeb2

Update checked-in dependencies

9169d24

Merge pull request #947 from github/mergeback/v1.1.3-to-main-75f07e7a

360221e

Mergeback v1.1.3 refs/heads/v1 into main

Revert "Merge pull request #869 from github/edoardo/windows-11-error"

42af723

This reverts commit faa9ba7, reversing changes made to 71112ab.

Merge pull request #948 from github/edoardo/revert-windows-11

438f654

Revert "Merge pull request #869 from github/edoardo/windows-11-error"

Update checked-in dependencies

0da8152

Merge pull request #949 from github/dependabot/npm_and_yarn/removeNPM…

117a67b

…AbsolutePaths-3.0.0 Bump removeNPMAbsolutePaths from 2.0.0 to 3.0.0

Update default CodeQL bundle version to 2.8.2

162ecaf

Expand PR checks to cover windows-2022

8ec6a84

Merge pull request #950 from github/hmakholm/pr/2.8.2

2531390

Update default CodeQL bundle version to 2.8.2

Delete the results directory in between runs.

86940df

Retry directory deletion to avoid Windows file locking issues.

d63f798

Co-authored-by: Andrew Eisenberg <[email protected]>

Add retryDelay and a type cast to make it work.

938e0a0

Merge pull request #955 from github/delete-results-directory

b1c781d

Delete the results directory in between runs.

Merge pull request #954 from github/edoardo/expand-tests

fa19286

Expand PR checks to cover `windows-2022`

Revert "Revert "Use --codescanning-config flag of CLI""

07990f0

This reverts commit 326e511.

Bump version flag for using --codescanning-config flag

527d515

Merge pull request #957 from github/edoardo/reuse-codescanning-config

e4766c8

Second attempt to use `--codescanning-config` flag of CLI

Fix link to docs

47dd636

Add runner OS and arch to status report

3615d8a

Use getRequiredEnvParam()

870dbaa

Co-authored-by: Andrew Eisenberg <[email protected]>

Update checked-in dependencies

4154eaf

Merge pull request #961 from github/dependabot/npm_and_yarn/actions/a…

5e27f57

…rtifact-1.0.0 Bump @actions/artifact from 0.5.2 to 1.0.0

Add runner OS release to status report

401a76f

Merge pull request #959 from cklin/report-runner-os-arch

939659c

Add runner OS and arch to status report

Merge pull request #958 from daniel-beck/fix-link

308528b

Fix link to docs

1.1.4

44198be

github-actions bot assigned aeisenberg Mar 7, 2022

aeisenberg reviewed Mar 7, 2022

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

Update CHANGELOG.md

a33ae09

Co-authored-by: Andrew Eisenberg <[email protected]>

hmakholm reviewed Mar 7, 2022

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

Update CHANGELOG.md

e75fa83

aeisenberg reviewed Mar 7, 2022

View reviewed changes

CHANGELOG.md Show resolved Hide resolved

aeisenberg reviewed Mar 7, 2022

View reviewed changes

Update CHANGELOG.md

701b6a5

Co-authored-by: Andrew Eisenberg <[email protected]>

hmakholm marked this pull request as ready for review March 7, 2022 17:15

hmakholm requested a review from a team as a code owner March 7, 2022 17:15

hmakholm enabled auto-merge March 7, 2022 17:15

aeisenberg approved these changes Mar 7, 2022

View reviewed changes

adityasharad previously requested changes Mar 7, 2022

View reviewed changes

adityasharad disabled auto-merge March 7, 2022 17:39

hmakholm reviewed Mar 7, 2022

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

Update CHANGELOG.md

1f44993

hmakholm enabled auto-merge March 7, 2022 19:25

hmakholm disabled auto-merge March 7, 2022 21:00

hmakholm merged commit f5d8227 into v1 Mar 7, 2022

hmakholm deleted the update-v1.1.4-308528ba branch March 7, 2022 21:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge main into v1 #965

Merge main into v1 #965

github-actions bot commented Mar 7, 2022 •

edited by aeisenberg

Loading

aeisenberg commented Mar 7, 2022

aeisenberg commented Mar 7, 2022

hmakholm commented Mar 7, 2022

edoardopirovano commented Mar 7, 2022

aeisenberg left a comment

adityasharad Mar 7, 2022

aeisenberg Mar 7, 2022

criemen Mar 7, 2022

Merge main into v1 #965

Merge main into v1 #965

Conversation

github-actions bot commented Mar 7, 2022 • edited by aeisenberg Loading

aeisenberg commented Mar 7, 2022

aeisenberg commented Mar 7, 2022

hmakholm commented Mar 7, 2022

edoardopirovano commented Mar 7, 2022

aeisenberg left a comment

Choose a reason for hiding this comment

adityasharad Mar 7, 2022

Choose a reason for hiding this comment

aeisenberg Mar 7, 2022

Choose a reason for hiding this comment

criemen Mar 7, 2022

Choose a reason for hiding this comment

github-actions bot commented Mar 7, 2022 •

edited by aeisenberg

Loading