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.

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

Merge main into releases/v3 #2437

Merged
merged 20 commits into from
Aug 21, 2024
Merged

Merge main into releases/v3 #2437

merged 20 commits into from
Aug 21, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 21, 2024

Merging ae01f80 into releases/v3.

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/v3 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • 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.
  • Merge the mergeback PR that will automatically be created once this PR is merged.
  • Merge all backport PRs to older release branches, that will automatically be created once this PR is merged.

marcogario and others added 20 commits July 30, 2024 18:55
Mergeback v3.26.3 refs/heads/releases/v3 into main
Registries Proxy: Support feeding a base64 encoded configuration
* Stop checking disk usage for MacOS ARM with SIP disabled

On MacOS ARM machines where SIP is disabled, after the build tracer is initialized in the `init` Action, we receive warnings when we run send status reports due to the `df` binary. This change will make it so that we no longer run `df` for those machines.
Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>
@angelapwen angelapwen marked this pull request as ready for review August 21, 2024 19:04
@angelapwen angelapwen requested a review from a team as a code owner August 21, 2024 19:04
@angelapwen angelapwen merged commit f0f3afe into releases/v3 Aug 21, 2024
304 checks passed
@angelapwen angelapwen deleted the update-v3.26.4-ae01f807c branch August 21, 2024 19:22
@github-actions github-actions bot mentioned this pull request Aug 21, 2024
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants