Skip to content

Commit ee3e41c

Browse files
authored
Merge pull request #825 from serokell/auto/update-brew-formulae-v20.3-1
[Chore] Add bottle hashes for v20.3-1
2 parents e35002d + 712e1a1 commit ee3e41c

19 files changed

+27
-21
lines changed

.github/workflows/build-bottles.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
os: [ { id: macos-12, name: "monterey" } ]
18+
os: [ { id: macos-13, name: "ventura" } ]
1919
# we don't bottle meta-formulas that contain only services
2020
formula: [tezos-smart-rollup-wasm-debugger, tezos-smart-rollup-node, tezos-dac-client, tezos-dac-node, tezos-dal-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-node, tezos-accuser-PsParisC, tezos-baker-PsParisC, tezos-accuser-PtParisB, tezos-baker-PtParisB, tezos-accuser-Proxford, tezos-baker-Proxford]
2121
steps:
@@ -54,7 +54,7 @@ jobs:
5454
if: steps.check-built.outcome == 'failure'
5555
uses: actions/upload-artifact@v4
5656
with:
57-
name: homebrew-bottles-${{ matrix.os }}
57+
name: ${{ matrix.formula }}-${{ github.run_id }}
5858
path: '*.bottle.*'
5959

6060
- name: Attach the bottle to the release
@@ -64,7 +64,7 @@ jobs:
6464
run: gh release upload "${{ env.tag }}" *.bottle.*
6565

6666
sync-hashes:
67-
runs-on: macos-12
67+
runs-on: macos-13
6868
needs: build-bottles
6969
steps:
7070
- name: Checkout
@@ -86,12 +86,12 @@ jobs:
8686

8787
# It's possible we have had to rerun the building workflow, skipping some jobs and
8888
# erasing the previously built bottles, so we use the release to download them all
89-
- name: Download Monterey bottles from the release
89+
- name: Download Ventura bottles from the release
9090
env:
9191
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
92-
run: gh release download "${{ github.ref_name }}" -p "*.monterey.bottle.tar.gz" -D "./Monterey"
92+
run: gh release download "${{ github.ref_name }}" -p "*.ventura.bottle.tar.gz" -D "./Ventura"
9393

9494
- name: Add bottle hashes to formulae
9595
env:
9696
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
97-
run: ./scripts/sync-bottle-hashes.sh "${{ github.ref_name }}" "Monterey"
97+
run: ./scripts/sync-bottle-hashes.sh "${{ github.ref_name }}" "Ventura"

Formula/tezos-accuser-PsParisC.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class << self
2626

2727
bottle do
2828
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsparisc.version}/"
29+
sha256 cellar: :any, ventura: "490aa62c6fa8b5502578f677ee4d0e8993212cc59f34546b50a6b787d15986bd"
2930
end
3031

3132
def make_deps

Formula/tezos-accuser-PtParisB.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class << self
2626

2727
bottle do
2828
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPtparisb.version}/"
29+
sha256 cellar: :any, ventura: "b8f6cb6a21cf2cf703cfdf61cf259414a5c6f7bfa950fc6470ff56c08ff9fe49"
2930
end
3031

3132
def make_deps

Formula/tezos-admin-client.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class << self
2626

2727
bottle do
2828
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/"
29+
sha256 cellar: :any, ventura: "5ba0c3cc55109cbafa9462d5371b6fbb62e57d5df14ef8315cfc584e65aa5c07"
2930
end
3031

3132
def make_deps

Formula/tezos-baker-PsParisC.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class << self
2626

2727
bottle do
2828
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPsparisc.version}/"
29+
sha256 cellar: :any, ventura: "e8b61dc8a01d2de538c89bb6e020df81e6d64f2ede819a62fe5d0230efbc6b33"
2930
end
3031

3132
def make_deps

Formula/tezos-baker-PtParisB.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class << self
2626

2727
bottle do
2828
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtparisb.version}/"
29+
sha256 cellar: :any, ventura: "8836c1c1d5f4d7e0c8777b953e1a7e0d028ce686a84e1acd402e09420ba09009"
2930
end
3031

3132
def make_deps

Formula/tezos-client.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class << self
2626

2727
bottle do
2828
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/"
29+
sha256 cellar: :any, ventura: "4efb6f382cecbd3cb51a42f8ec32c94e030212a4339294fb61eff120817b855f"
2930
end
3031

3132
def make_deps

Formula/tezos-codec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class << self
2626

2727
bottle do
2828
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/"
29+
sha256 cellar: :any, ventura: "7332ca78fd2aa4f91694629c278a9be92b381e16d89e49e8c5a2d75ea658446e"
2930
end
3031

3132
def make_deps

Formula/tezos-dac-client.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class << self
2626

2727
bottle do
2828
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacClient.version}/"
29+
sha256 cellar: :any, ventura: "5049f227af507b9e9c1daad5f712b7f557b0034d743952c9f3f0994c2e54541e"
2930
end
3031

3132
def make_deps

Formula/tezos-dac-node.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class << self
2626

2727
bottle do
2828
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacNode.version}/"
29+
sha256 cellar: :any, ventura: "71efd560049626a0dbb7e0a47d46c8d379d75a0c0eee1d93bf6a0210af267266"
2930
end
3031

3132
def make_deps

Formula/tezos-dal-node.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class << self
2626

2727
bottle do
2828
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDalNode.version}/"
29+
sha256 cellar: :any, ventura: "28e1064941f25d217c1f782aa814f9cfbde6c8ad0fc914dd7a15ee4ab4c08252"
2930
end
3031

3132
def make_deps

Formula/tezos-node.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class << self
2626

2727
bottle do
2828
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/"
29+
sha256 cellar: :any, ventura: "fb0bac1a458ee6821591e180ec8cf9e54afea1927d43070ee1443cf8f5399304"
2930
end
3031

3132
def make_deps

Formula/tezos-signer.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class << self
2626

2727
bottle do
2828
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/"
29+
sha256 cellar: :any, ventura: "5cc06d5b860d4e8c2084f324d977e38cbee4a8671c5a8470ac41a8ebaafe5aa3"
2930
end
3031

3132
def make_deps

Formula/tezos-smart-rollup-node.rb

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class << self
2828

2929
bottle do
3030
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNode.version}/"
31+
sha256 cellar: :any, ventura: "d063c53cf47ece2ebe64b2221340c05cbca1094e7beaa0dc4ed4d246ab7b0afd"
3132
end
3233

3334
def make_deps

Formula/tezos-smart-rollup-wasm-debugger.rb

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class << self
2727

2828
bottle do
2929
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupWasmDebugger.version}/"
30+
sha256 cellar: :any, ventura: "8afc3d417f115d99df4d9790da280b1f92c09864b9be56d07f1cb8533cf36b62"
3031
end
3132

3233
def make_deps

docs/support-policy.md

-6
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,4 @@ There are packages for `x86_64` and `aarch64` architectures.
4646
## macOS brew formulae
4747

4848
Brew formulae provided by `tezos-packaging` aim to support all maintained macOS versions, currently:
49-
* macOS 12 (Monterey)
5049
* macOS 13 (Ventura)
51-
52-
Unfortunately, the ability to provide pre-compiled brew bottles for formulae has
53-
a hard dependency on the available build infrastructure.
54-
Thus we currently only provide brew bottles for the following macOS versions:
55-
* macOS 12 (Monterey) both `x86_64` and `arm64`

scripts/bottle-hashes.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if [[ -d ./Formula ]]
1111
then
1212
if [[ -d "$1" ]]
1313
then
14-
regex="(tezos-.*)-v.*\.(monterey|arm64_monterey)\.bottle\.tar\.gz"
14+
regex="(tezos-.*)-v.*\.(ventura|arm64_ventura)\.bottle\.tar\.gz"
1515
for bottle in "$1"/tezos-*.bottle.tar.gz; do
1616
if [[ $bottle =~ $regex ]]; then
1717
bottle_hash=$(sha256sum "$bottle" | cut -d " " -f 1)

scripts/update-brew-formulae.sh

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ then
1212
find ./Formula -type f \( -name 'tezos-*.rb' ! -name 'tezos-sapling-params.rb' \) \
1313
-exec sed -i "s/version \"v.*\"/version \"$version\"/g" {} \; \
1414
-exec sed -i "s/:tag => \".*\"/:tag => \"$tag\"/g" {} \; \
15-
-exec sed -i "/catalina/d" {} \; \
16-
-exec sed -i "/monterey/d" {} \; \
17-
-exec sed -i "/arm64_monterey/d" {} \; \
18-
-exec sed -i "/mojave/d" {} \;
15+
-exec sed -i "/ventura/d" {} \; \
16+
-exec sed -i "/arm64_ventura/d" {} \;
1917
else
2018
echo "Please run this script from the base directory (tezos-packaging)."
2119
fi

tests/bottle-hashes/test-hash-insert.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ class TezosHashTest < Formula
3333
end
3434
EOL
3535

36-
monterey_bottle="$formula_name-v0.0-0.monterey.bottle.tar.gz"
36+
ventura_bottle="$formula_name-v0.0-0.ventura.bottle.tar.gz"
3737

3838
# Generate some dummy bottles
39-
dd if=/dev/urandom of=$bottle_dir/$monterey_bottle count=2000 status=none
39+
dd if=/dev/urandom of=$bottle_dir/$ventura_bottle count=2000 status=none
4040

4141
# Run the hash inserting script
4242
../../scripts/bottle-hashes.sh "$bottle_dir" "v0.0-1"
4343

4444
# Assert the info was inserted correctly
45-
monterey_hash="$(sha256sum $bottle_dir/$monterey_bottle | cut -d " " -f 1)"
45+
ventura_hash="$(sha256sum $bottle_dir/$ventura_bottle | cut -d " " -f 1)"
4646

4747
expected_formula=$(cat << EOF
4848
class TezosHashTest < Formula
@@ -56,7 +56,7 @@ class TezosHashTest < Formula
5656
5757
bottle do
5858
root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosHashTest.version}/"
59-
sha256 cellar: :any, monterey: "$monterey_hash"
59+
sha256 cellar: :any, ventura: "$ventura_hash"
6060
end
6161
6262
def install

0 commit comments

Comments
 (0)