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/v3 into releases/v2 #2289

Merged
merged 35 commits into from
May 13, 2024
Merged

Merge releases/v3 into releases/v2 #2289

merged 35 commits into from
May 13, 2024

Conversation

henrymercer
Copy link
Contributor

Merging b7cec75 into releases/v2.

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/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.

aeisenberg and others added 30 commits May 7, 2024 13:30
@aeisenberg
Avoid warning on workflow_call triggers
ca7f194 
Typically, we warn when there is no `push` trigger in the
workflow file that triggered this run. However, when this
action is triggered by a `workflow_call` event, we assume
there is a custom process for triggering the action and we
don't want to warn in this case.
@aeisenberg
Add a compatibility table to the README
e50fb8f 
Specifies the versions of the action, CLI and GHES that are jointly compatible.
@henrymercer
Add user error for "Pack cannot be found"
ec11790
@henrymercer
Add user error for gracefully running out of memory
45fb58a 
As opposed to being killed by the JVM, which is a failure not a
user error.
@github-actions
Update changelog and version after v3.25.4
a21528b
@henrymercer
Add more invalid SARIF processing errors
b1c3187
@github-actions
Update checked-in dependencies
65c9ae9
@henrymercer
Run release process using Python 3.12
2c25369
@henrymercer
Merge pull request #2276 from github/mergeback/v3.25.4-to-main-ccf74c94
e36d338 
Mergeback v3.25.4 refs/heads/releases/v3 into main
@henrymercer
Merge pull request #2279 from github/henrymercer/python-3.12
7aff39e 
Run release process using Python 3.12
@henrymercer
Merge pull request #2277 from github/henrymercer/more-user-errors
715d348 
Add more user errors
@aeisenberg
Merge pull request #2274 from github/aeisenberg/no-warn-workflow_call
7d9b7a1 
Avoid warning on workflow_call triggers
@aeisenberg @henrymercer
Update README.md
43beef6 
Co-authored-by: Henry Mercer <henrymercer@github.com>
@aeisenberg
Merge branch 'main' into aeisenberg/specify-versions
9fba755
@aeisenberg
Move changelog notes to proper section
d234275
@henrymercer
Add support for on-demand feature flags
c49579b
@henrymercer
Log feature flags on separate lines in debug mode
9dc84e9 
This prevents them from being truncated.
@henrymercer
Remove "_enabled" suffix from non-legacy features
cf4c3b4
@henrymercer
Don't call trace-command when the indirect tracer has already been …
7a6352f 
…started
@henrymercer
End tracing early in autobuild Action for improved performance and re…
5ac5c91 
…liability

This lets us achieve some performance and reliability improvements for
workflows that run autobuild directly without specifying a build mode.
@aeisenberg
Merge pull request #2273 from github/aeisenberg/specify-versions
def4d2c 
Add a compatibility table to the README
@henrymercer
Merge pull request #2282 from github/henrymercer/no-build-mode-tracin…
4995c49 
…g-improvements

End tracing in autobuild Action for workflows that don't specify a build mode
@henrymercer
Merge branch 'main' into henrymercer/on-demand-ffs
67f8a36
@henrymercer
Comment that legacyApi is false by default
33e416c
@henrymercer
Disable fail fast in generated workflows
c59e052
@henrymercer
Disable fail fast for non-generated workflows
f73b0b7
@henrymercer
Merge pull request #2283 from github/henrymercer/disable-fail-fast
a8c32fd 
Disable `fail-fast` for PR checks
@henrymercer
Merge pull request #2280 from github/henrymercer/on-demand-ffs
4a51972 
Add support for on-demand feature flags
@github-actions
Update changelog for v3.25.5
6778fe4
@henrymercer
Merge pull request #2287 from github/update-v3.25.5-4a5197247
b7cec75 
Merge main into releases/v3
@henrymercer henrymercer added the Update dependencies Trigger PR workflow to update dependencies label May 13, 2024
@henrymercer henrymercer self-assigned this May 13, 2024
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label May 13, 2024
@github-actions GitHub Actions
Copy link
Contributor

Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks.

@henrymercer henrymercer marked this pull request as ready for review May 13, 2024 13:21
@henrymercer henrymercer requested a review from a team as a code owner May 13, 2024 13:21
@NlightNFotis
Copy link
Member

Hello, don't know how useful my review on this would be, but happy to do a review if needed.

I do have a question though, just to build my understanding of our process:

This is the PR that adds the new features to the release branch correct? Assuming it gets merged, this means that anyone using the action/v2 will be able to pick these changes up next time they run the action. Or am I misunderstanding?

@NlightNFotis
Copy link
Member

On second thoughts, I had a look at the diff, and this appears to be just a sync PR, needing just a stamp. Happy to give it to unblock us.

@henrymercer
Copy link
Contributor Author

That's right — currently we bring all the latest features from v3 into v2 (apart from Node 20 support), and to do that we have a backport PR like this each time we release the CodeQL Action. Usually it's automatically generated, but this one updated a workflow file, and updating workflow files requires a PAT, so we had to run it manually. Thanks for the review!

@henrymercer henrymercer merged commit d05fceb into releases/v2 May 13, 2024
320 checks passed
@henrymercer henrymercer deleted the backport-v2.25.5-b7cec7526 branch May 13, 2024 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NlightNFotis NlightNFotis NlightNFotis approved these changes

Assignees

@henrymercer henrymercer

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@henrymercer @NlightNFotis @aeisenberg