Skip to content

Merge releases/v2 into releases/v1#1288

Merged
angelapwen merged 6 commits intoreleases/v1from
update-v1.1.27-80757836
Oct 7, 2022
Merged

Merge releases/v2 into releases/v1#1288
angelapwen merged 6 commits intoreleases/v1from
update-v1.1.27-80757836

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Oct 6, 2022 •
edited by angelapwen
Loading

Merging 8075783 into releases/v1

Conductor for this PR is @angelapwen.

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.

github-actions bot and others added 5 commits October 6, 2022 23:17
@github-actions @cklin
@angelapwen @web-flow @edoardopirovano @aeisenberg @henrymercer
Merge main into releases/v2 (#1287)
8075783 
* Update changelog and version after v2.1.26

* Update checked-in dependencies

* Don't check for Go logs on failure (#1279)

* Update supported GitHub Enterprise Server versions. (#1275)

Co-authored-by: GitHub <noreply@github.com>

* TRAP Caching: Add timeouts to upload/download operations

* Add logging statements declaring state of the cli_config_file_enabled

It's possible to determine this otherwise, but this makes it easier to
spot.

* Avoid using single value as array

The user config parser in the CLI doesn't yet support it.

* Extract logging statements to separate function

* Correctly report CodeQL version when using cache (#1259)

* Correctly report CodeQL version when using cache

* Add JS generated files

* Add test for return value of `setupCodeQL`

* Fill in missing return value comment

* Convert "Invalid source root" errors to UserErrors

* Add changelog note for Go extraction reconciliation (#1286)

* Add changelog note for Go extraction reconciliation

* Update CHANGELOG.md

Co-authored-by: Henry Mercer <henrymercer@github.com>

* Update CHANGELOG.md

Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>

* Tweaks from PR review

Co-authored-by: Henry Mercer <henrymercer@github.com>
Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>

* Update changelog for v2.1.27

Co-authored-by: github-actions[bot] <github-actions@github.com>
Co-authored-by: Chuan-kai Lin <cklin@github.com>
Co-authored-by: Angela P Wen <angelapwen@github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub <noreply@github.com>
Co-authored-by: Edoardo Pirovano <edoardo.pirovano@gmail.com>
Co-authored-by: Edoardo Pirovano <6748066+edoardopirovano@users.noreply.github.com>
Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>
Co-authored-by: Henry Mercer <henrymercer@github.com>
Revert "Update version and changelog for v1.1.26"
0bb9f8e 
This reverts commit 7e79eb6.
Revert "Update checked-in dependencies"
75e286a 
This reverts commit 6548772.
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.27…
d5b0890 
…-80757836
Update version and changelog for v1.1.27
fe49f6c
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Oct 6, 2022
@henrymercer
Copy link
Contributor

henrymercer commented Oct 7, 2022

I'll move the PR checks along so they should be ready for morning PT :)

@henrymercer
Copy link
Contributor

henrymercer commented Oct 7, 2022

We're only seeing one PR in the list here since the main -> releases/v2 PR #1287 was squash-merged. In future we should try to avoid squash merging release PRs. Disabling squash merge on the repo would prevent this from happening again, but I think we probably should leave the squash merge option available on the repo as it can be useful for merging third-party contributions with lots of commits.

@henrymercer henrymercer added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Oct 7, 2022
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Oct 7, 2022
@henrymercer henrymercer marked this pull request as ready for review October 7, 2022 09:17
@henrymercer henrymercer requested a review from a team as a code owner October 7, 2022 09:17
@angelapwen
Copy link
Contributor

angelapwen commented Oct 7, 2022

We're only seeing one PR in the list here since the main -> releases/v2 PR #1287 was squash-merged. In future we should try to avoid squash merging release PRs. Disabling squash merge on the repo would prevent this from happening again, but I think we probably should leave the squash merge option available on the repo as it can be useful for merging third-party contributions with lots of commits.

Thanks Henry! For documentation purposes — we'll leave the squash merge option on the repo, but update the release PR template automation to explicitly indicate using the "Create a merge commit" option.

@angelapwen angelapwen merged commit 2eeff7b into releases/v1 Oct 7, 2022
@angelapwen angelapwen deleted the update-v1.1.27-80757836 branch October 7, 2022 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@angelapwen angelapwen angelapwen approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@angelapwen angelapwen

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@henrymercer @angelapwen