Merge pull request #797 from serokell/auto/update-brew-formulae-octez…

…-v20.0-1

[Chore] Add bottle hashes for octez-v20.0-1

.buildkite/pipeline-for-tags.yml

@@ -15,7 +15,7 @@ steps:
 
  - label: Build ubuntu source packages
    key: build-ubuntu-source-packages
-   if: build.tag =~ /^v.*-1/
+   if: build.tag =~ /^octez-v.*-1/
    commands:
    - eval "$SET_VERSION"
    - nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type source
@@ -24,15 +24,15 @@ steps:
 
  - label: Build fedora source packages
    key: build-fedora-source-packages
-   if: build.tag =~ /^v.*-1/
+   if: build.tag =~ /^octez-v.*-1/
    commands:
    - eval "$SET_VERSION"
    - nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type source
    artifact_paths:
      - ./out/*
 
  - label: Sign ubuntu source packages
-   if: build.tag =~ /^v.*-1/
+   if: build.tag =~ /^octez-v.*-1/
    depends_on:
    - "build-ubuntu-source-packages"
    key: sign-ubuntu-source-packages
@@ -44,7 +44,7 @@ steps:
      - ./out/*
 
  - label: Sign fedora source packages
-   if: build.tag =~ /^v.*-1/
+   if: build.tag =~ /^octez-v.*-1/
    depends_on:
    - "build-fedora-source-packages"
    key: sign-fedora-source-packages
@@ -56,7 +56,7 @@ steps:
      - ./out/*
 
  - label: Publish ubuntu native packages
-   if: build.tag =~ /^v.*-1/
+   if: build.tag =~ /^octez-v.*-1/
    depends_on:
    - "sign-ubuntu-source-packages"
    commands:
@@ -65,7 +65,7 @@ steps:
    - nix develop .#buildkite -c ./docker/build/ubuntu/upload.py -d out
 
  - label: Publish fedora native packages
-   if: build.tag =~ /^v.*-1/
+   if: build.tag =~ /^octez-v.*-1/
    depends_on:
    - "sign-fedora-source-packages"
    commands:
@@ -74,7 +74,7 @@ steps:
    - nix develop .#buildkite -c ./docker/build/fedora/upload.py -d out
 
  - label: build-via-docker
-   if: build.tag =~ /^v.*-1/
+   if: build.tag =~ /^octez-v.*-1/
    key: build-via-docker
    commands:
    - eval "$SET_VERSION"
@@ -85,7 +85,7 @@ steps:
 
  - label: Build source packages from static binaries
    key: build-source-packages-from-static-binaries
-   if: build.tag =~ /^v.*-1/
+   if: build.tag =~ /^octez-v.*-1/
    depends_on:
    - "build-via-docker"
    commands:
@@ -98,7 +98,7 @@ steps:
 
  - label: Sign source packages built from static binaries
    key: sign-source-packages-built-from-static-binaries
-   if: build.tag =~ /^v.*-1/
+   if: build.tag =~ /^octez-v.*-1/
    depends_on:
    - "build-source-packages-from-static-binaries"
    commands:
@@ -109,7 +109,7 @@ steps:
      - ./epel/*
 
  - label: Publish epel packages
-   if: build.tag =~ /^v.*-1/
+   if: build.tag =~ /^octez-v.*-1/
    depends_on:
    - "sign-source-packages-built-from-static-binaries"
    commands:
@@ -120,7 +120,7 @@ steps:
 
  - label: Build Monterey x86_64 bottles
    key: build-bottles-monterey-x86_64
-   if: build.tag =~ /^v.*/
+   if: build.tag =~ /^octez-v.*/
    agents:
      queue: "x86_64-rosetta-darwin"
    commands:
@@ -133,7 +133,7 @@ steps:
 
  - label: Build Monterey arm64 bottles
    key: build-bottles-monterey-arm64
-   if: build.tag =~ /^v.*/
+   if: build.tag =~ /^octez-v.*/
    agents:
      queue: "arm64-darwin"
    commands:
@@ -151,7 +151,7 @@ steps:
    depends_on:
    - "build-bottles-monterey-arm64"
    - "build-bottles-monterey-x86_64"
-   if: build.tag =~ /^v.*/
+   if: build.tag =~ /^octez-v.*/
    commands:
    - mkdir -p "Monterey"
    - nix develop .#buildkite -c gh release download "$BUILDKITE_TAG" -D "Monterey/" -p "*monterey.bottle.tar.gz"

.buildkite/pipeline-raw.yml

@@ -212,8 +212,8 @@ steps:
  - label: update stable mirror repository
    if: |
      build.branch == "master" &&
-       ( build.message =~ /^Merge pull request .* from serokell\/auto\/v[0-9]+\.[0-9]+-release/ ||
-         build.message =~ /^Merge pull request .* from serokell\/auto\/update-brew-formulae-v[.0-9]+-[0-9]+/ )
+       ( build.message =~ /^Merge pull request .* from serokell\/auto\/octez-v[0-9]+\.[0-9]+-release/ ||
+         build.message =~ /^Merge pull request .* from serokell\/auto\/update-brew-formulae-octez-v[.0-9]+-[0-9]+/ )
    depends_on:
    - "auto-release"
    env:
@@ -225,8 +225,8 @@ steps:
  - label: update RC mirror repository
    if: |
      build.branch == "master" &&
-       (build.message =~ /^Merge pull request .* from serokell\/auto\/v[0-9]+\.[0-9]+-(rc|beta).*-release/ ||
-          build.message =~ /^Merge pull request .* from serokell\/auto\/update-brew-formulae-v[.0-9]+-(rc|beta).*/)
+       (build.message =~ /^Merge pull request .* from serokell\/auto\/octez-v[0-9]+\.[0-9]+-(rc|beta).*-release/ ||
+          build.message =~ /^Merge pull request .* from serokell\/auto\/update-brew-formulae-octez-v[.0-9]+-(rc|beta).*/)
    depends_on:
    - "auto-release"
    env:

Formula/tezos-accuser-Proxford.rb

@@ -26,6 +26,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserProxford.version}/"
+    sha256 cellar: :any, monterey: "e2c1fd666f5ffb560de21d4cf1d404eb21718a8d58f0543d85048109af22f33b"
+    sha256 cellar: :any, arm64_monterey: "1795bfc4fc489e92ce956555c5e2a8ea8890fbb9c78dc6864639d7c52488fb72"
   end
 
   def make_deps

Formula/tezos-accuser-PtParisB.rb

@@ -26,6 +26,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPtparisb.version}/"
+    sha256 cellar: :any, monterey: "10685121a02dd9002d16a119c29bccad4fc59b8d7f6c8e250b935d8457d30b6e"
+    sha256 cellar: :any, arm64_monterey: "bb3d2c6b727d077ed62e039f7e2093a139e57e559b72421d727dd408a9032eff"
   end
 
   def make_deps

Formula/tezos-admin-client.rb

@@ -26,6 +26,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/"
+    sha256 cellar: :any, monterey: "30388af26d6a30b7e247b8cb9313ce6d5419794585033e8054686fa7ac0681d9"
+    sha256 cellar: :any, arm64_monterey: "f8a690fc6b7433b94def70d720903bbdeee4a5398c2aa35e0f7ef31894d6d893"
   end
 
   def make_deps

Formula/tezos-baker-Proxford.rb

@@ -26,6 +26,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerProxford.version}/"
+    sha256 cellar: :any, monterey: "d10e05031349373fe0d1c4b1748fe0f888fe2f178abf9022038bd32c1261281d"
+    sha256 cellar: :any, arm64_monterey: "269938a965cc75fefd9123bf51a65e77e41d19e68170094b9a90d35d1ba5e884"
   end
 
   def make_deps

Formula/tezos-baker-PtParisB.rb

@@ -26,6 +26,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtparisb.version}/"
+    sha256 cellar: :any, monterey: "a92dd5de095381809df8181b8983708055e54fab514d5eea50c4ce18ecc71e7b"
+    sha256 cellar: :any, arm64_monterey: "33154d763324c804021c04bc84675976de87eb74f0283d53adb3ec1a6aafe39a"
   end
 
   def make_deps

Formula/tezos-client.rb

@@ -26,6 +26,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/"
+    sha256 cellar: :any, monterey: "a7d20a683e297fa6f91767af9adebada28cd84de16089c5b425a098cae8774c0"
+    sha256 cellar: :any, arm64_monterey: "0910cb34c2526d093708556c7f854bd8d2bb735e5e35a9a9ae3018badb53692e"
   end
 
   def make_deps

Formula/tezos-codec.rb

@@ -26,6 +26,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/"
+    sha256 cellar: :any, monterey: "5e7385a78cd36858b80c3db18371ecd22049e494b68eceec35ed0bba48d4b47a"
+    sha256 cellar: :any, arm64_monterey: "58e36e8ee60058d8bdc2d4574be0525385abdaeb8972c788be159867b4091891"
   end
 
   def make_deps

Formula/tezos-dac-client.rb

@@ -26,6 +26,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacClient.version}/"
+    sha256 cellar: :any, monterey: "3598d47ef4f26a9d5eaa7e94d0701f62c9ec2e9f6f93fbab5508129512cd8544"
+    sha256 cellar: :any, arm64_monterey: "b5f4fd52733c3b358593a4ea26c7d112dd616a91bdc0a58dc6bab31eef682d91"
   end
 
   def make_deps

Formula/tezos-dac-node.rb

@@ -26,6 +26,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacNode.version}/"
+    sha256 cellar: :any, monterey: "76e1f1e17064a401a23d9fbbe7a6bc306ee440dcf7650f3d2840ef8862d4daa2"
+    sha256 cellar: :any, arm64_monterey: "7d3967a222137804f89bba4e0d6bb018b667a279c192ec5fcca04ae7fc7803c2"
   end
 
   def make_deps

Formula/tezos-dal-node.rb

@@ -26,6 +26,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDalNode.version}/"
+    sha256 cellar: :any, monterey: "23bf1c6a2d6b952002cb119d56e0e8d654a933b512db3ec2b940e3642a66a3c7"
+    sha256 cellar: :any, arm64_monterey: "a20eb2e363c6bbf177dffc6b91e5b447924dcb41be12ddfbeebafa75f8b4a626"
   end
 
   def make_deps

Formula/tezos-node.rb

@@ -26,6 +26,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/"
+    sha256 cellar: :any, monterey: "8176c1b22e45b1f8a17d0ebb84849178c92c49af4e147ea2ebe9a60085841d60"
+    sha256 cellar: :any, arm64_monterey: "164277bb281634e822e37d1f572f90025497d6edd9dc89d2e6d67c94239f1f97"
   end
 
   def make_deps

Formula/tezos-signer.rb

@@ -26,6 +26,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/"
+    sha256 cellar: :any, monterey: "ef09418cdb1003345eb019323be71ad76df27b2910b9aa1b42933dae76f0dc86"
+    sha256 cellar: :any, arm64_monterey: "00d97f2abd7c33886c1abdc668ee66a952fa1798a8784b950c7b71cf2c6cacc6"
   end
 
   def make_deps

Formula/tezos-smart-rollup-node.rb

@@ -28,6 +28,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNode.version}/"
+    sha256 cellar: :any, monterey: "484e7a06ecc1e64cf45760523d3a1deb0826f396619b897122ff0ebc752d6e47"
+    sha256 cellar: :any, arm64_monterey: "20c41e2678e1e72c176c69b58b34c375565637f7a9a6db49cf4739de45f1a390"
   end
 
   def make_deps

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

@@ -27,6 +27,8 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupWasmDebugger.version}/"
+    sha256 cellar: :any, monterey: "dcf9fdb912826a4e6fcb8ebab14bc064b71c4c09307666ac01a8a37d06efdeb8"
+    sha256 cellar: :any, arm64_monterey: "8a63a9b4a0d2e8a636b66898a9d2b59d20ebb5d14452391edec700bb9b04255d"
   end
 
   def make_deps

docs/baking.md

@@ -116,7 +116,6 @@ In order to avoid this, we suggest bootstrapping from a snapshot instead.
 
 Snapshots can be downloaded from the following websites:
 * [Lambs on acid](https://lambsonacid.nl/)
-* [Marigold](https://snapshots.tezos.marigold.dev/)
 * [Tzinit](https://snapshots.eu.tzinit.org/)
 
 Download the snapshot for the desired network. We recommend to use rolling snapshots. This is

scripts/bottle-hashes.sh

@@ -19,7 +19,7 @@ then
                 os="${BASH_REMATCH[2]}"
                 formula_file="./Formula/$formula_name.rb"
                 if [[ -f $formula_file ]]; then
-                    formula_tag="$(sed -n "s/^\s\+version \"\(.*\)\"/\1/p" "$formula_file")"
+                    formula_tag="octez-$(sed -n "s/^\s\+version \"\(.*\)\"/\1/p" "$formula_file")"
                     line="\    sha256 cellar: :any, $os: \"$bottle_hash\""
                     # Update only when formula has the same version as provided current tag
                     if [[ "$formula_tag" == "$2" ]]; then

scripts/build-all-bottles.sh

@@ -32,7 +32,7 @@ for f in "${formulae[@]}"; do
     # build a bottle
     if ./scripts/build-one-bottle.sh "$f"; then
       # upload the bottle to its respective release
-      FORMULA_TAG="$(sed -n "s/^\s\+version \"\(.*\)\"/\1/p" "./Formula/$f.rb")"
+      FORMULA_TAG="octez-$(sed -n "s/^\s\+version \"\(.*\)\"/\1/p" "./Formula/$f.rb")"
       if ! gh release upload "$FORMULA_TAG" "$f"*.bottle.*; then
         # we want a non-0 exit code if any of the bottles couldn't be uploaded
         retval="1";

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

@@ -39,7 +39,7 @@ monterey_bottle="$formula_name-v0.0-0.monterey.bottle.tar.gz"
 dd if=/dev/urandom of=$bottle_dir/$monterey_bottle count=2000 status=none
 
 # Run the hash inserting script
-../../scripts/bottle-hashes.sh "$bottle_dir" "v0.0-1"
+../../scripts/bottle-hashes.sh "$bottle_dir" "octez-v0.0-1"
 
 # Assert the info was inserted correctly
 monterey_hash="$(sha256sum $bottle_dir/$monterey_bottle | cut -d " " -f 1)"