Skip to content

macos CI: use brew trust (backport #1666)#1670

Merged
scpeters merged 1 commit into
sdf12from
mergify/bp/sdf12/pr-1666
Jun 26, 2026
Merged

macos CI: use brew trust (backport #1666)#1670
scpeters merged 1 commit into
sdf12from
mergify/bp/sdf12/pr-1666

Conversation

@mergify

@mergify mergify Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

🦟 Bug fix

Similar to gazebo-tooling/release-tools#1508

Summary

Homebrew's package descriptions (formulae) are implemented as executable ruby code, which can lead to security issues when using 3rd-party taps, so they have recently added a brew trust command to help mitigate security issues, documented here. It is now required to use brew trust osrf/simulation after brew tap osrf/simulation in order to run additional commands like brew install gz-jetty. I have updated the macos workflow script to fix it, as it is currently broken.

Backport Policy

  • This is safe to backport to the following versions:
    • Jetty
    • Ionic
    • Harmonic
    • Fortress
  • This should not be backported
  • I am not sure
  • Other (fill in yourself)

Checklist

  • Signed all commits for DCO
  • Added a screen capture or video to the PR description that demonstrates the fix (as needed)
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • Updated Bazel files (if adding new files). Created an issue otherwise.
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers
  • Was GenAI used to generate this PR? If so, make sure to add "Generated-by" to your commits. (See this policy for more info.)

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by and Generated-by messages.

Backports: If this is a backport, please use Rebase and Merge instead.


This is an automatic backport of pull request #1666 done by Mergify.

@mergify mergify Bot requested a review from azeey as a code owner June 12, 2026 10:13
@mergify mergify Bot added the conflicts label Jun 12, 2026
@mergify mergify Bot requested a review from scpeters as a code owner June 12, 2026 10:13
@mergify

mergify Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of b8691e0 has failed:

On branch mergify/bp/sdf12/pr-1666
Your branch is up to date with 'origin/sdf12'.

You are currently cherry-picking commit b8691e07.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/macos.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot added the conflicts label Jun 12, 2026
@mergify mergify Bot mentioned this pull request Jun 12, 2026
19 tasks
@github-actions github-actions Bot added the 🏯 fortress Ignition Fortress label Jun 12, 2026
Signed-off-by: Steve Peters <scpeters@intrinsic.ai>
(cherry picked from commit b8691e0)
@scpeters scpeters force-pushed the mergify/bp/sdf12/pr-1666 branch from 3080070 to 5ca4659 Compare June 12, 2026 10:17
@scpeters

Copy link
Copy Markdown
Member

I resolved conflicts, external review requested

@github-project-automation github-project-automation Bot moved this from Inbox to In review in Core development Jun 26, 2026
@scpeters scpeters merged commit a81aa59 into sdf12 Jun 26, 2026
10 checks passed
@scpeters scpeters deleted the mergify/bp/sdf12/pr-1666 branch June 26, 2026 17:39
@github-project-automation github-project-automation Bot moved this from In review to Done in Core development Jun 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants