diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ec24a02..998a079 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,7 +30,11 @@ jobs: - run: brew test-bot --only-tap-syntax - - run: brew test-bot --only-formulae --root-url='https://ghcr.io/v2/cartesi/homebrew-tap' + # --only-json-tab keeps the install receipt out of the bottle tarball, which is + # what makes bottles reproducible across platforms. Without it, the formulae that + # ship no compiled code (the two images and the metapackage) get a distinct + # per-OS bottle instead of collapsing into a single `all:` one on `brew pr-pull`. + - run: brew test-bot --only-formulae --only-json-tab --root-url='https://ghcr.io/v2/cartesi/homebrew-tap' if: github.event_name == 'pull_request' - name: Upload bottles as artifact diff --git a/Formula/cartesi-machine-emulator.rb b/Formula/cartesi-machine-emulator.rb index babf520..b5c6b75 100644 --- a/Formula/cartesi-machine-emulator.rb +++ b/Formula/cartesi-machine-emulator.rb @@ -4,13 +4,7 @@ class CartesiMachineEmulator < Formula url "https://github.com/cartesi/machine-emulator/archive/refs/tags/v0.21.0.tar.gz" sha256 "44fc83cb08a1907e66ab225ccf421b0fdad3f145be35b9a9ffe561d3563e3eda" license "LGPL-3.0-only" - revision 1 - - bottle do - root_url "https://ghcr.io/v2/cartesi/tap" - sha256 arm64_tahoe: "17884f95a498193147c668592000b7342d81fec93851b3713bd3bda69208835f" - sha256 arm64_sequoia: "61fa160b84c3d116d5003edbca53005f661cfee6053f155b4a33b23effabcffb" - end + revision 2 depends_on "boost" => :build depends_on "llvm" => :build diff --git a/Formula/cartesi-machine-linux-image.rb b/Formula/cartesi-machine-linux-image.rb index a5f869e..6c7bf60 100644 --- a/Formula/cartesi-machine-linux-image.rb +++ b/Formula/cartesi-machine-linux-image.rb @@ -2,18 +2,12 @@ class CartesiMachineLinuxImage < Formula desc "Kernel image for the Cartesi Machine" homepage "https://github.com/cartesi/machine-linux-image" - bottle do - root_url "https://ghcr.io/v2/cartesi/tap" - sha256 cellar: :any_skip_relocation, arm64_tahoe: "13b9017add8be28ba291992b0f51b1a583e22a4ff695127c8eb3ad8518b5549f" - sha256 cellar: :any_skip_relocation, arm64_sequoia: "198e2417a3afae903fe3235fdf81953ff1c71cb65cc6eade477947f5e10094fb" - end - VERSION = "0.21.0".freeze LINUX_IMAGE = "linux-6.5.13-ctsi-2-v#{VERSION}.bin".freeze url "https://github.com/cartesi/machine-linux-image/releases/download/v#{VERSION}/#{LINUX_IMAGE}" sha256 "5c900060da2db2bfa84cd39cd9cd722988c83c42225f3cac55f2d3157e48f32f" license "GPL-2.0-only" - revision 1 + revision 2 def install share.install self.class::LINUX_IMAGE diff --git a/Formula/cartesi-machine-rootfs-image.rb b/Formula/cartesi-machine-rootfs-image.rb index b2d427e..c1b9f28 100644 --- a/Formula/cartesi-machine-rootfs-image.rb +++ b/Formula/cartesi-machine-rootfs-image.rb @@ -2,19 +2,13 @@ class CartesiMachineRootfsImage < Formula desc "Rootfs image for the Cartesi Machine" homepage "https://github.com/cartesi/machine-guest-tools" - bottle do - root_url "https://ghcr.io/v2/cartesi/tap" - sha256 cellar: :any_skip_relocation, arm64_tahoe: "7b178250dc004a23003ace7861260e3fd687749c996a543529b834e108fe1817" - sha256 cellar: :any_skip_relocation, arm64_sequoia: "c0f1dc6b55fed36c7dd6358fced9fec8f2c7d82bb89f2ab46b0325bd08ff1201" - end - VERSION = "v0.18.0".freeze ROOTFS_IMAGE = "rootfs-tools.ext2".freeze url "https://github.com/cartesi/machine-guest-tools/releases/download/#{VERSION}/#{ROOTFS_IMAGE}" version "0.21.0" sha256 "6c159937485c99f695021c4f2ea2a57bdadcf4e4bce8e71af5bee3bb9552802e" license "GPL-2.0-only" - revision 1 + revision 2 def install share.install self.class::ROOTFS_IMAGE diff --git a/Formula/cartesi-machine.rb b/Formula/cartesi-machine.rb index 59ed409..4101c9d 100644 --- a/Formula/cartesi-machine.rb +++ b/Formula/cartesi-machine.rb @@ -4,13 +4,7 @@ class CartesiMachine < Formula url "https://github.com/cartesi/machine-emulator/archive/refs/tags/v0.21.0.tar.gz" sha256 "44fc83cb08a1907e66ab225ccf421b0fdad3f145be35b9a9ffe561d3563e3eda" license "LGPL-3.0-only" - revision 1 - - bottle do - root_url "https://ghcr.io/v2/cartesi/tap" - sha256 cellar: :any_skip_relocation, arm64_tahoe: "73ee8d279c620a9d12f4408434d67d36b4321277ca50a55091dfb6dfd9d3998e" - sha256 cellar: :any_skip_relocation, arm64_sequoia: "78deda26b74a3a52a13e7dbf210b0e1f2d85b0835227660dd5531368dd1f6bbb" - end + revision 2 depends_on "cartesi-machine-emulator" depends_on "cartesi-machine-linux-image"