Skip to content

Merge releases/v3 into releases/v2 #2264

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 16 commits into from
Apr 25, 2024
Merged

Merge releases/v3 into releases/v2 #2264

merged 16 commits into from
Apr 25, 2024

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Apr 25, 2024 •
edited by angelapwen
Loading

Merging d39d31e into releases/v2.

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/v2 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.
github-actions bot and others added 15 commits April 17, 2024 10:06
@github-actions
Update default bundle to codeql-bundle-v2.17.1
501f5f5
@github-actions
Add changelog note
39e1e65
@github-actions
Update changelog and version after v3.25.2
619dc0c
@github-actions
Update checked-in dependencies
ff6a3c4
@aeisenberg
Merge pull request #2255 from github/mergeback/v3.25.2-to-main-8f596b4a
dbf2b17 
Mergeback v3.25.2 refs/heads/releases/v3 into main
Merge branch 'main' into update-bundle/codeql-bundle-v2.17.1
79d9ee7
Merge pull request #2247 from github/update-bundle/codeql-bundle-v2.17.1
0ad7791 
Update default bundle to 2.17.1
@angelapwen
Log warning if SIP is disabled and CLI version is < 2.15.1 (#2261)
ac2f82a 
* PR Checks: use `macos-12` runners for CLI v. < 2.15.1

Prior to CLI v2.15.1, MacOS ARM runners were not supported by the build tracer. "macos-latest" is now an ARM runner, so we run these tests on the old CLIs on Intel runners instead.

* Log a warning if SIP is disabled and CLI is < 2.15.1

* Add changenote for SIP-disabled support on old CLI versions

* Set up Python 3.11 for all MacOS checks
@github-actions
Update changelog for v3.25.3
1efa859
@angelapwen
Move changenote to most recent section
a727825
@angelapwen
Merge pull request #2262 from github/update-v3.25.3-ac2f82a1f
d39d31e 
Merge main into releases/v3
@github-actions
Revert "Update version and changelog for v2.25.2"
04aff1f 
This reverts commit 42cbd34.
@github-actions
Revert "Update checked-in dependencies"
caa3163 
This reverts commit b849f33.
@github-actions
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.25…
e76c364 
….3-d39d31e68
@github-actions
Update version and changelog for v2.25.3
64ccee9
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Apr 25, 2024
@angelapwen angelapwen added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Apr 25, 2024
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Apr 25, 2024
@github-actions
Copy link
Contributor Author

github-actions bot commented Apr 25, 2024

Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks.
@angelapwen angelapwen marked this pull request as ready for review April 25, 2024 23:08
@angelapwen angelapwen requested a review from a team as a code owner April 25, 2024 23:08
@angelapwen angelapwen enabled auto-merge April 25, 2024 23:22
@angelapwen angelapwen merged commit ceaec5c into releases/v2 Apr 25, 2024
@angelapwen angelapwen deleted the backport-v2.25.3-d39d31e68 branch April 25, 2024 23:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants

@angelapwen @aeisenberg