Skip to content

Merge releases/v2 into releases/v1 #1362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 28 commits into from
Nov 14, 2022
Merged

Merge releases/v2 into releases/v1 #1362

merged 28 commits into from
Nov 14, 2022

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Nov 14, 2022 •
edited by henrymercer
Loading

Merging 4238421 into releases/v1

Conductor for this PR is @henrymercer.

Contains the following pull requests:

Please do the following:

  • Ensure the CHANGELOG displays the correct version and date.
  • Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.
  • Check that there are not any unexpected commits being merged into the releases/v1 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.
  • Wait for the "Update dependencies" workflow to push a commit updating the dependencies.
  • Mark the PR as ready for review to trigger the full set of PR checks.
  • Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.

henrymercer and others added 27 commits November 1, 2022 16:59
@henrymercer
Add file baseline information feature
5da50dc
@henrymercer
Forward file baseline information enablement to CLI
89e1893
Update changelog and version after v2.1.31
6a5e69e
Update checked-in dependencies
31a2afe
@aeisenberg
Merge pull request #1346 from github/mergeback/v2.1.31-to-main-c3b6fce4
8aff97f 
Mergeback v2.1.31 refs/heads/releases/v2 into main
@henrymercer
Bump default CodeQL version to 2.11.3
dba70ac
@henrymercer
Add PR check for file baseline information
b9b7d9f
@henrymercer
Check expected SARIF notification objects
029ecc0
@henrymercer
Merge pull request #1329 from github/henrymercer/file-baseline-info-e…
c606252 
…nablement

Enable file baseline information behind a feature gate
@henrymercer
Improve experience when init fails before generating a config file
f9948ff 
Suppose a customer has a run where the init Action failed before saving
a config file.
When the customer opens their Actions logs, the UI currently focuses on
the post init step, since this is the last step that failed.
Demoting the error in the post init Action to a warning means that the
UI will instead focus on the `init` step, which is more useful for
debugging what went wrong.
@henrymercer
Merge pull request #1349 from github/henrymercer/improve-focus-when-i…
0e5b04a 
…nit-fails

Improve experience when init fails before generating a config file
use ATM pack v0.4.0 for CLI v2.11.3 and above
01c4458
Merge pull request #1351 from kaeluka/release-atm-v0.4.0
73ff862 
use ATM pack v0.4.0 for CLI v2.11.3 and above
add ATM 0.4.0 to changelog
fb3fdd7
Merge pull request #1353 from kaeluka/add-ATM-0.4.0-to-changelog
7c9e85e 
Add ATM 0.4.0 to changelog
@edoardopirovano
Force exit of process if a timeout has occurred
d6f6ef4
@edoardopirovano
Merge pull request #1354 from github/edoardo/force-exit-on-timeout
006bb00 
Force exit of process if a timeout has occurred
@henrymercer
Merge branch 'main' into henrymercer/use-codeql-2.11.3
9452b6b
@henrymercer
Fix Python query identifier in file baseline information PR check
76a7740
@henrymercer
Pin npm to latest v8 release to address failing PR check
718930b 
npm v9 is not compatible with Node 12, so we can't update to it yet.
@henrymercer
Merge pull request #1348 from github/henrymercer/use-codeql-2.11.3
33b10be 
Bump default CodeQL version to 2.11.3
Update changelog for v2.1.32
97be623
@henrymercer
Merge pull request #1360 from github/update-v2.1.32-33b10be6
4238421 
Merge main into releases/v2
Revert "Update version and changelog for v1.1.31"
1f97bcf 
This reverts commit 6132391.
Revert "Update checked-in dependencies"
27e1772 
This reverts commit 1cebd8a.
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.32…
f405ab8 
…-42384213
Update version and changelog for v1.1.32
b3d9a91
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Nov 14, 2022
@henrymercer henrymercer removed the Update dependencies Trigger PR workflow to update dependencies label Nov 14, 2022
@henrymercer henrymercer added the Update dependencies Trigger PR workflow to update dependencies label Nov 14, 2022
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Nov 14, 2022
@henrymercer henrymercer marked this pull request as ready for review November 14, 2022 12:58
@henrymercer henrymercer requested a review from a team as a code owner November 14, 2022 12:58
henrymercer
henrymercer previously approved these changes Nov 14, 2022
View reviewed changes
@henrymercer
Copy link
Contributor

The "Update dependencies" label triggered a workflow run using the version on releases/v1 that has not yet been patched to use npm v8 (that patch is included in this PR but is not yet on the branch). Therefore the "Update checked-in dependencies" commit that was pushed is wrong. I'll create one manually.

@henrymercer henrymercer force-pushed the update-v1.1.32-42384213 branch from 6ee188a to f71b2a3 Compare November 14, 2022 14:42
@henrymercer henrymercer merged commit 8d0f245 into releases/v1 Nov 14, 2022
@henrymercer henrymercer deleted the update-v1.1.32-42384213 branch November 14, 2022 15:16
This was referenced Apr 25, 2023
Open
Open
Open
Open
@aliscco aliscco mentioned this pull request Jun 25, 2023
Open
@aliscco aliscco mentioned this pull request Jul 4, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@henrymercer henrymercer henrymercer left review comments

+1 more reviewer

@edoardopirovano edoardopirovano edoardopirovano approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@henrymercer henrymercer

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@henrymercer @edoardopirovano @aeisenberg