Skip to content
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

Merge releases/v2 into releases/v1 #1309

Merged
merged 23 commits into from
Oct 17, 2022
Merged

Merge releases/v2 into releases/v1 #1309

merged 23 commits into from
Oct 17, 2022

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Oct 17, 2022 •
edited by henrymercer
Loading

Merging 5dd7367 into releases/v1

Conductor for this PR is @aeisenberg.

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 22 commits September 29, 2022 17:46
Update changelog and version after v2.1.26
885b397
Update checked-in dependencies
ffa74c5
@cklin
Merge pull request #1277 from github/mergeback/v2.1.26-to-main-e0e5ded3
0831a67 
Mergeback v2.1.26 refs/heads/releases/v2 into main
@angelapwen
Don't check for Go logs on failure (#1279)
57719e0
@github-actions @web-flow
Update supported GitHub Enterprise Server versions. (#1275)
61b87c6 
Co-authored-by: GitHub <noreply@github.com>
@edoardopirovano
TRAP Caching: Add timeouts to upload/download operations
c0641ea
@edoardopirovano
Merge pull request #1280 from github/edoardo/add-timeout
4cf8004 
TRAP Caching: Add timeouts to upload/download operations
@aeisenberg
Add logging statements declaring state of the cli_config_file_enabled
6ace05b 
It's possible to determine this otherwise, but this makes it easier to
spot.
@aeisenberg
Avoid using single value as array
59fbe34 
The user config parser in the CLI doesn't yet support it.
@aeisenberg
Extract logging statements to separate function
5960ce1
@aeisenberg
Merge pull request #1281 from github/aeisenberg/cli-config-processing
f359ba7 
Add logging statements declaring state of the cli_config_file_enabled
@angelapwen
Correctly report CodeQL version when using cache (#1259)
24c8de1 
* Correctly report CodeQL version when using cache

* Add JS generated files

* Add test for return value of `setupCodeQL`

* Fill in missing return value comment
@aeisenberg
Convert "Invalid source root" errors to UserErrors
9e044c5
@aeisenberg
Merge pull request #1282 from github/aeisenberg/user-error-source-root
84dffe7 
Convert "Invalid source root" errors to UserErrors
@angelapwen @henrymercer @aeisenberg
Add changelog note for Go extraction reconciliation (#1286)
e4cc4a2 
* 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>
@aeisenberg
Merge commit 'e4cc4a2f' into releases/v2
c2f5185
@aeisenberg
Fix CHANGELOG
4c1ccc4
@aeisenberg
Merge pull request #1308 from github/aeisenberg/fix-merge
5dd7367 
Fix the merge into releases/v2
Revert "Update version and changelog for v1.1.27"
09aebd0 
This reverts commit fe49f6c.
Revert "Update checked-in dependencies"
c9864f3 
This reverts commit 54257f7.
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.27…
27694b3 
…-5dd73678
Update version and changelog for v1.1.27
a0e10fe
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Oct 17, 2022
@aeisenberg aeisenberg closed this Oct 17, 2022
@aeisenberg aeisenberg reopened this Oct 17, 2022
@aeisenberg aeisenberg marked this pull request as ready for review October 17, 2022 16:34
@aeisenberg aeisenberg added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Oct 17, 2022
@aeisenberg aeisenberg marked this pull request as draft October 17, 2022 16:35
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Oct 17, 2022
@aeisenberg aeisenberg added the Update dependencies Trigger PR workflow to update dependencies label Oct 17, 2022
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Oct 17, 2022
@aeisenberg aeisenberg added the Update dependencies Trigger PR workflow to update dependencies label Oct 17, 2022
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Oct 17, 2022
@henrymercer henrymercer marked this pull request as ready for review October 17, 2022 18:18
@aeisenberg
Copy link
Contributor

@henrymercer, I can no longer approve this PR since I pushed to it. Can you do it instead?

@aeisenberg aeisenberg merged commit 642d5ce into releases/v1 Oct 17, 2022
@aeisenberg aeisenberg deleted the update-v1.1.27-5dd73678 branch October 17, 2022 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@henrymercer henrymercer henrymercer approved these changes

Assignees

@aeisenberg aeisenberg

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@aeisenberg @henrymercer @cklin @angelapwen @edoardopirovano