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

Merged
merged 26 commits into from
Aug 21, 2024
Merged

Conversation

github-actions[bot]
Copy link
Contributor

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

Merging f0f3afe 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.

marcogario and others added 25 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.
* Consider registries_credentials as input

* Clean-up logging

* More debugging of credentials

* Support URL

* Validate credentials input

* fixes

* Try upload teh proxy logs

* Update changelog and version after v3.26.3

* Update checked-in dependencies

* Stop checking disk usage for MacOS ARM with SIP disabled (#2434)

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

* Add deprecation message to `add-snippets` input.

* Update changelog with deprecation.

* Add link to PR deprecating `add-snippets` to CHANGELOG.md

Co-authored-by: Andrew Eisenberg <[email protected]>

* Address incorrect changelog location

* Update changelog for v3.26.4

---------

Co-authored-by: Marco Gario <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Henry Mercer <[email protected]>
Co-authored-by: Arthur Baars <[email protected]>
Co-authored-by: Angela P Wen <[email protected]>
Co-authored-by: Remco Vermeulen <[email protected]>
Co-authored-by: Remco Vermeulen <[email protected]>
Co-authored-by: Andrew Eisenberg <[email protected]>
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Aug 21, 2024
@angelapwen angelapwen added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Aug 21, 2024
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Aug 21, 2024
Copy link
Contributor Author

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 August 21, 2024 19:28
@angelapwen angelapwen requested a review from a team as a code owner August 21, 2024 19:28
@angelapwen angelapwen merged commit 8903674 into releases/v2 Aug 21, 2024
304 checks passed
@angelapwen angelapwen deleted the backport-v2.26.4-f0f3afee8 branch August 21, 2024 20:13
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