Merge pull request #358 from serokell/rvem/#353-more-big-sur-in-ci

[#353] arm64 Big Sur bottles building in CI
serokell · Dec 20, 2021 · 598c79e · 598c79e
2 parents 048a448 + f6f9423
commit 598c79e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.buildkite/pipeline-for-tags.yml b/.buildkite/pipeline-for-tags.yml
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: LicenseRef-MIT-TQ
 
 steps:
- - label: Build bottles
+ - label: Build Big Sur arm64 bottles
    key: build-bottles
    agents:
-     queue: "x86_64-darwin"
+     queue: "arm64-darwin"
    if: build.tag =~ /^v.*/
    commands:
    - ./scripts/build-bottles.sh
@@ -34,14 +34,14 @@ steps:
    - buildkite-agent artifact download "out/*" . --step build-source-packages
    - ./scripts/publish-native-packages.sh out
 
- - label: Add Mojave bottle hashes to formulae
+ - label: Add Big Sur arm64 bottle hashes to formulae
    depends_on:
    - "build-bottles"
    if: build.tag =~ /^v.*/
    commands:
    - buildkite-agent artifact download --step build-bottles "*" .
    - nix-shell ./scripts/shell.nix
-       --run './scripts/sync-bottle-hashes.sh "$BUILDKITE_TAG" "Mojave"'
+       --run './scripts/sync-bottle-hashes.sh "$BUILDKITE_TAG" "Big Sur arm64"'
 
  - label: Attach bottles to the release
    depends_on:

diff --git a/Formula/tezos-sapling-params.rb b/Formula/tezos-sapling-params.rb
@@ -16,6 +16,7 @@ class TezosSaplingParams < Formula
     sha256 cellar: :any, mojave: "4e89932b0626cffe80214ba45342280c340b34c58ebbf7c3e0185a6d4662732d"
     sha256 cellar: :any, catalina: "5f7a5687d67051eafcfb7cb5ac542143a325a135403daeca6595602bfd400441"
     sha256 cellar: :any, big_sur: "c910acffd3369bf5c4e0cff112efe6d56035394639b9571d845ad5ecb4dbd01f"
+    sha256 cellar: :any, arm64_big_sur: "d7c04f2f95e459cb8639e99fb998311adc1d0babfd026987a1dcecf1e77e1f96"
   end
 
   def install

diff --git a/scripts/bottle-hashes.sh b/scripts/bottle-hashes.sh
@@ -12,7 +12,7 @@ if [[ -d ./Formula ]]
 then
     if [[ -d "$1" ]]
     then
-        regex="(tezos-.*)-v.*\.(catalina|mojave|big_sur)\.bottle\.tar\.gz"
+        regex="(tezos-.*)-v.*\.(catalina|mojave|big_sur|arm64_big_sur)\.bottle\.tar\.gz"
         for bottle in "$1"/tezos-*.bottle.tar.gz; do
             if [[ $bottle =~ $regex ]]; then
                 bottle_hash=`sha256sum "$bottle" | cut -d " " -f 1`

diff --git a/scripts/update-brew-formulae.sh b/scripts/update-brew-formulae.sh
@@ -17,7 +17,8 @@ then
             -exec sed -i "s/:tag => \"v.*\"/:tag => \"$version\"/g" {} \; \
             -exec sed -i "/catalina/d" {} \; \
             -exec sed -i "/mojave/d" {} \; \
-            -exec sed -i "/big_sur/d" {} \;
+            -exec sed -i "/big_sur/d" {} \; \
+            -exec sed -i "/arm64_big_sur/d" {} \;
     else
         echo "The argument does not look like a tag, which should have a form of 'v*-[0-9]*'"
     fi