Skip to content

Merge master into openssl-migration-staging#134982

Merged
carlocab merged 800 commits into
openssl-migration-stagingfrom
conflict-resolution
Jun 26, 2023
Merged

Merge master into openssl-migration-staging#134982
carlocab merged 800 commits into
openssl-migration-stagingfrom
conflict-resolution

Conversation

@carlocab

@carlocab carlocab commented Jun 26, 2023

Copy link
Copy Markdown
Member

@carlocab carlocab added the CI-syntax-only Change only affects brew syntax, not the install. Only run syntax CI. label Jun 26, 2023
@github-actions github-actions Bot added the automerge-skip `brew pr-automerge` will skip this pull request label Jun 26, 2023
@carlocab carlocab changed the base branch from master to openssl-migration-staging June 26, 2023 09:59
@carlocab carlocab requested review from a team and MikeMcQuaid as code owners June 26, 2023 09:59
@carlocab carlocab closed this Jun 26, 2023
@carlocab carlocab reopened this Jun 26, 2023
@github-actions github-actions Bot added the workflows PR modifies GitHub Actions workflow files label Jun 26, 2023
Conflicts:
Formula/keyring.rb
Formula/libzip.rb
Formula/moto.rb
Formula/node.rb
Formula/node@18.rb
@carlocab carlocab force-pushed the conflict-resolution branch from 027faa9 to ee373aa Compare June 26, 2023 10:31
@carlocab carlocab added the ready to merge PR can be merged once CI is green label Jun 26, 2023
@carlocab carlocab enabled auto-merge June 26, 2023 10:40
@carlocab carlocab added the staging-branch-pr This pull request targets a *-staging branch. label Jun 26, 2023
@carlocab carlocab merged commit 003d317 into openssl-migration-staging Jun 26, 2023
@carlocab carlocab deleted the conflict-resolution branch June 26, 2023 14:04
carlocab added a commit to carlocab/homebrew-core that referenced this pull request Jun 26, 2023
This needs to be rebuilt after the merge of master into
openssl-migration-staging at Homebrew#134982.
carlocab added a commit to carlocab/homebrew-core that referenced this pull request Jun 26, 2023
This needs to be rebuilt after the merge of master into
openssl-migration-staging at Homebrew#134982.
carlocab added a commit to carlocab/homebrew-core that referenced this pull request Jun 26, 2023
This needs to be rebuilt after the merge of master into
openssl-migration-staging at Homebrew#134982.
carlocab added a commit to carlocab/homebrew-core that referenced this pull request Jun 26, 2023
This needs to be rebuilt after the merge of master into
openssl-migration-staging at Homebrew#134982.
carlocab added a commit to carlocab/homebrew-core that referenced this pull request Jun 26, 2023
This needs to be rebuilt after the merge of master into
openssl-migration-staging at Homebrew#134982.
@github-actions github-actions Bot added the outdated PR was locked due to age label Jul 27, 2023
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Jul 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge-skip `brew pr-automerge` will skip this pull request CI-syntax-only Change only affects brew syntax, not the install. Only run syntax CI. outdated PR was locked due to age ready to merge PR can be merged once CI is green staging-branch-pr This pull request targets a *-staging branch. workflows PR modifies GitHub Actions workflow files

Projects

None yet

Development

Successfully merging this pull request may close these issues.