Skip to content

Commit 0a68614

Browse files
Merge pull request cli#13479 from cli/wm-no-homebrew
Stop bumping homebrew on release
2 parents 6bbaae0 + 230498e commit 0a68614

4 files changed

Lines changed: 12 additions & 59 deletions

File tree

.github/workflows/deployment.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -414,14 +414,4 @@ jobs:
414414
else
415415
git log --oneline @{upstream}..
416416
git diff --name-status @{upstream}..
417-
fi
418-
- name: Bump homebrew-core formula
419-
uses: mislav/bump-homebrew-formula-action@ccf2332299a883f6af50a1d2d41e5df7904dd769
420-
if: inputs.environment == 'production' && !contains(inputs.tag_name, '-')
421-
with:
422-
formula-name: gh
423-
formula-path: Formula/g/gh.rb
424-
tag-name: ${{ inputs.tag_name }}
425-
push-to: williammartin/homebrew-core
426-
env:
427-
COMMITTER_TOKEN: ${{ secrets.HOMEBREW_PR_PAT }}
417+
fi

.github/workflows/homebrew-bump.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

docs/release-process-deep-dive.md

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ From a high level, the [release workflow](https://github.com/cli/cli/blob/537a22
1111
* Builds and updates the [manual](https://cli.github.com/manual) and repository packages
1212
* Creates GitHub Attestations for the artifacts
1313
* Creates a GitHub Release and attaches the artifacts
14-
* Bumps the `gh` [homebrew-core formula](https://github.com/Homebrew/homebrew-core/blob/2df031cbd8f7bc9b9a380e941ccefcf3c8f3d02b/Formula/g/gh.rb)
1514

1615
# Jobs Deep Dive
1716

@@ -569,16 +568,6 @@ release:
569568
git log --oneline @{upstream}..
570569
git diff --name-status @{upstream}..
571570
fi
572-
- name: Bump homebrew-core formula
573-
uses: mislav/bump-homebrew-formula-action@v3
574-
if: inputs.environment == 'production' && !contains(inputs.tag_name, '-')
575-
with:
576-
formula-name: gh
577-
formula-path: Formula/g/gh.rb
578-
tag-name: ${{ inputs.tag_name }}
579-
push-to: williammartin/homebrew-core
580-
env:
581-
COMMITTER_TOKEN: ${{ secrets.HOMEBREW_PR_PAT }}
582571
```
583572
</details>
584573

@@ -647,11 +636,11 @@ In previous steps, a git commit was made for the manual, and files had moved int
647636

648637
Occasionally, the repository can become unwieldy due to hosting so many large binary artifacts. Instructions can be found in the README for that repository.
649638

650-
#### Homebrew Formula
639+
#### Homebrew
651640

652-
Using [`mislav/bump-homebrew-formula-action`](https://github.com/mislav/bump-homebrew-formula-action), a PR for the `gh` [`homebrew-core` formula](https://github.com/Homebrew/homebrew-core/blob/master/Formula/g/gh.rb) is created. The fork repository is currently owned by `williammartin` as PRs are [not accepted from organizations.](https://github.com/cli/cli/pull/7953)
641+
Historically, we used [`mislav/bump-homebrew-formula-action`](https://github.com/mislav/bump-homebrew-formula-action). It created a PR for the `gh` [`homebrew-core` formula](https://github.com/Homebrew/homebrew-core/blob/master/Formula/g/gh.rb). The fork repository was owned by `williammartin` because PRs are [not accepted from organizations.](https://github.com/cli/cli/pull/7953)
653642

654-
`Homebrew/formulae.brew.sh` makes new formula versions available every 15 minutes through scheduled CI workflow. For more information, see https://docs.brew.sh/Formula-Cookbook#an-introduction
643+
However, since this required a legacy PAT token to open a PR between these repositories, it was deemed too much risk for our security. As such, we now rely on [Homebrew's autobump](https://docs.brew.sh/Autobump).
655644

656645
## <a id="deepest-dive">Deepest Dive</a>
657646

docs/releasing.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ What this does is:
2121
- Uploads all release artifacts to a new GitHub Release;
2222
- A new git tag `vX.Y.Z` is created in the remote repository;
2323
- The changelog is [generated from the list of merged pull requests](https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes);
24-
- Updates [GitHub CLI marketing site](https://cli.github.com) with the contents of the new release;
25-
- Updates the [`gh` Homebrew formula](https://github.com/williammartin/homebrew-core/blob/master/Formula/g/gh.rb) in the [`homebrew/homebrew-core` repo](https://github.com/search?q=repo%3AHomebrew%2Fhomebrew-core+%22gh%22+in%3Atitle&type=pullrequests).
24+
- Updates [GitHub CLI marketing site](https://cli.github.com) with the contents of the new release.
2625

27-
> [!NOTE]
28-
> `Homebrew/formulae.brew.sh` makes new formula versions available every 15 minutes through scheduled [CI workflow](https://github.com/Homebrew/formulae.brew.sh/actions/workflows/tests.yml).
29-
>
30-
> For more information, see https://docs.brew.sh/Formula-Cookbook#an-introduction
26+
## Bumping Homebrew
27+
28+
Homebrew bumps are handled by [autobump](https://docs.brew.sh/Autobump), which runs periodically every 3 hours. In cases where a quicker rollout is required, a pull request can be opened manually with the following steps:
29+
1. Replace the version number in the url to point ot the updated version.
30+
2. Calculate and replace the sha256 value.
31+
3. Open the PR.
3132

3233
To test out the build system while avoiding creating an actual release:
3334

@@ -60,6 +61,5 @@ Occasionally, it might be necessary to clean up a bad release and re-release.
6061

6162
1. Delete the release and associated tag
6263
2. Re-release and monitor the workflow run logs
63-
3. Open pull request updating [`gh` Homebrew formula](https://github.com/williammartin/homebrew-core/blob/master/Formula/g/gh.rb)
64-
with new SHA versions, linking the previous PR
64+
3. Open pull request updating [`gh` Homebrew formula](https://github.com/Homebrew/homebrew-core/blob/master/Formula/g/gh.rb) with new SHA versions, linking the previous PR
6565
4. Verify resulting Debian and RPM packages, Homebrew formula

0 commit comments

Comments
 (0)