Skip to content

Commit

Permalink
Remove bottle block
Browse files Browse the repository at this point in the history
  • Loading branch information
Bo98 committed Jun 3, 2022
1 parent 08f6262 commit a213023
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 36 deletions.
19 changes: 1 addition & 18 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ jobs:
- name: Configure Git user
uses: Homebrew/actions/git-user-config@master

- name: Set up commit signing
uses: Homebrew/actions/setup-commit-signing@master
with:
signing_key: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY }}

- name: Setup directory
run: mkdir bottles

Expand All @@ -79,21 +74,9 @@ jobs:
- name: Upload to GitHub Packages
working-directory: bottles
env:
BREWTESTBOT_NAME_EMAIL: "BrewTestBot <[email protected]>"
HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
HOMEBREW_GITHUB_PACKAGES_USER: ${{ github.actor }}
HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{ github.token }}
run: brew pr-upload --debug --committer="${BREWTESTBOT_NAME_EMAIL}" --root-url=https://ghcr.io/v2/${GITHUB_REPOSITORY_OWNER,,}/portable-ruby

- name: Push commits
uses: Homebrew/actions/git-try-push@master
with:
token: ${{ github.token }}
branch: ${{ github.ref_name }}
env:
GIT_COMMITTER_NAME: BrewTestBot
GIT_COMMITTER_EMAIL: [email protected]
HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
run: brew pr-upload --debug --upload-only --root-url=https://ghcr.io/v2/${GITHUB_REPOSITORY_OWNER,,}/portable-ruby

- name: Push tag
env:
Expand Down
7 changes: 0 additions & 7 deletions Formula/portable-ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ class PortableRuby < PortableFormula
license "Ruby"
revision 1

bottle do
root_url "https://ghcr.io/v2/homebrew/portable-ruby"
sha256 cellar: :any_skip_relocation, arm64_big_sur: "f2d5cab5a4dd49e5b3de780a3cd0a1f61642fea247d1c25aa40cd43f1be290b5"
sha256 cellar: :any_skip_relocation, yosemite: "0cb1cc7af109437fe0e020c9f3b7b95c3c709b140bde9f991ad2c1433496dd42"
sha256 cellar: :any_skip_relocation, x86_64_linux: "cd7fffb18ef9338baa670fc5e8fce99b0e3cc0f0fd7627bcbb56f3c8d54161d4"
end

depends_on "pkg-config" => :build
depends_on "portable-readline" => :build
depends_on "portable-libyaml" => :build
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,10 @@ Copy the bottle `bottle*.tar.gz` and `bottle*.json` files into a directory on yo
Upload these files to GitHub Packages with:

```sh
brew pr-upload --root-url=https://ghcr.io/v2/homebrew/portable-ruby
brew pr-upload --upload-only --root-url=https://ghcr.io/v2/homebrew/portable-ruby
```

This will create a bottle commit. Open a PR and merge this into master.

Once the commit is in master, create a new GitHub tag with:
And to GitHub releases:

```sh
brew pr-upload --upload-only --root-url=https://github.com/Homebrew/homebrew-portable-ruby/releases/download/$VERSION
Expand Down
8 changes: 1 addition & 7 deletions cmd/portable-package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,8 @@ def portable_package_args
EOS
switch "--no-uninstall-deps",
description: "Don't uninstall all dependencies of portable formulae before testing."
switch "--no-rebuild",
description: "Remove `rebuild`."
switch "--keep-old",
description: "Attempt to keep `rebuild` at its original value."
switch "-v", "--verbose",
description: "Pass `--verbose` to `brew` commands."
conflicts "--no-rebuild", "--keep-old"
named_args :formula, min: 1
end
end
Expand Down Expand Up @@ -55,9 +50,8 @@ def portable_package
--skip-relocation
--root-url=https://ghcr.io/v2/homebrew/portable-ruby
--json
--no-rebuild
]
bottle_args << "--no-rebuild" if args.no_rebuild?
bottle_args << "--keep-old" if args.keep_old?
safe_system "brew", "bottle", *verbose, *bottle_args, name
Pathname.glob("*.bottle*.tar.gz") do |bottle_filename|
bottle_file = bottle_filename.realpath
Expand Down

0 comments on commit a213023

Please sign in to comment.