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 #1278

Merged
merged 28 commits into from Sep 29, 2022
Merged

Merge releases/v2 into releases/v1 #1278

merged 28 commits into from Sep 29, 2022

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 29, 2022 •
edited by cklin

Merging e0e5ded into releases/v1

Conductor for this PR is @cklin.

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 27 commits September 21, 2022 18:42
Update changelog and version after v2.1.25
4706007
Update checked-in dependencies
6188cbd
@henrymercer
Merge pull request #1263 from github/mergeback/v2.1.25-to-main-86f3159a
a643eb3 
Mergeback v2.1.25 refs/heads/releases/v2 into main
@edoardopirovano
TRAP Caching: Skip uploading of small caches
b98b2de
@edoardopirovano
Merge pull request #1265 from github/edoardo/minimum-cache-size
4c8f137 
TRAP Caching: Skip uploading of small caches
@edoardopirovano
Fix broken unit test
b96c754
@edoardopirovano
Merge pull request #1266 from github/edoardo/fix-unit-test
314ede6 
Fix broken unit test
@aeisenberg
Add the CliConfigFileEnabled feature flag
e37b0d6 
Also, wire it up to the `useCodeScanningConfigInCli` function.
@aeisenberg
Update src/util.test.ts
cab46c5
@angelapwen @aeisenberg
Update unset environment variables PR check (#1269)
1f0700d 
* Only test Java for CLI v2.5+

* Improve bash code style

* Set Actions error messages

Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>
@web-flow
Update supported GitHub Enterprise Server versions.
cc4ee05
@jsoref
Correct program name
a4e4529
@edoardopirovano
Merge pull request #1268 from jsoref/rev-parse
28c63d1 
Correct program name
@henrymercer
Merge pull request #1272 from github/update-supported-enterprise-serv…
39064e0 
…er-versions

Update supported GitHub Enterprise Server versions.
@cklin
Update default CodeQL version to 2.11.0
a711c76
@cklin
Merge pull request #1267 from github/cklin/codeql-cli-2.11.0
2466f0c 
Update default CodeQL version to 2.11.0
@aeisenberg
Merge branch 'main' into aeisenberg/cli-config-feature-flag
1ec8ea9
@aeisenberg
Merge pull request #1270 from github/aeisenberg/cli-config-feature-flag
74740ee 
Add the `CliConfigFileEnabled` feature flag
@angelapwen
Add dotnet env variable to workflow (#1273)
3400e51
@aeisenberg
Update the checks script
fb0f747 
Avoid requiring test-setup-python-scripts checks.
@aeisenberg
Merge pull request #1274 from github/aeisenberg/update-checks-script
9705474 
Update the checks script
Update changelog for v2.1.26
c60b854
@cklin
Merge pull request #1276 from github/update-v2.1.26-97054749
e0e5ded 
Merge main into releases/v2
Revert "Update version and changelog for v1.1.25"
c9559f9 
This reverts commit e4a1505.
Revert "Update checked-in dependencies"
af3f782 
This reverts commit b27be7b.
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.26…
d6b82d8 
…-e0e5ded3
Update version and changelog for v1.1.26
7e79eb6
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Sep 29, 2022
@cklin cklin removed the Update dependencies Trigger PR workflow to update dependencies label Sep 29, 2022
@cklin cklin added the Update dependencies Trigger PR workflow to update dependencies label Sep 29, 2022
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Sep 29, 2022
@cklin cklin marked this pull request as ready for review September 29, 2022 18:26
@cklin cklin requested a review from a team as a code owner September 29, 2022 18:26
@cklin cklin merged commit 64b7bbc into releases/v1 Sep 29, 2022
@cklin cklin deleted the update-v1.1.26-e0e5ded3 branch September 29, 2022 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cklin cklin cklin approved these changes

Assignees

@cklin cklin

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@cklin @henrymercer @edoardopirovano @aeisenberg @angelapwen @web-flow @jsoref