From 764001fb650ed667dd1ee22375e5b48a9438d337 Mon Sep 17 00:00:00 2001 From: Ry Jones Date: Tue, 25 Jun 2024 08:40:48 -0700 Subject: [PATCH] chore: update to macos 13 (#178) * chore: update to macos 13 Signed-off-by: Ry Jones Co-authored-by: garyschulte --- .github/workflows/build.yml | 20 ++++++++++---------- build.sh | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01f73ff8..8211d9a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,9 +20,9 @@ jobs: sudo apt-get install -y autoconf build-essential libtool automake patchelf sudo apt autoremove -y # golang dependencies - wget https://go.dev/dl/go1.20.2.linux-amd64.tar.gz - echo "4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768 go1.20.2.linux-amd64.tar.gz" | sha256sum -c || exit 1 - tar -xzf go1.20.2.linux-amd64.tar.gz + wget https://go.dev/dl/go1.22.4.linux-amd64.tar.gz + echo "ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d go1.22.4.linux-amd64.tar.gz" | sha256sum -c || exit 1 + tar -xzf go1.22.4.linux-amd64.tar.gz export GOROOT=$(pwd)/go export PATH=$GOROOT/bin:$PATH # rust dependencies @@ -111,7 +111,7 @@ jobs: name: gnark native build artifacts path: gnark/build/ native-build-macos: - runs-on: macos-11 + runs-on: macos-13 env: SKIP_GRADLE: true steps: @@ -120,7 +120,7 @@ jobs: # secp256k1 dependencies brew install autoconf automake libtool # gnark dependencies - brew install go@1.20 || true + brew install go@1.22 || true # rust dependencies export CARGO_HOME="$HOME/.cargo" curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.75.0 @@ -186,7 +186,7 @@ jobs: # secp256k1, gnark dependencies brew install autoconf automake libtool # gnark dependencies - brew install go@1.20 || true + brew install go@1.22 || true # rust dependencies export CARGO_HOME="$HOME/.cargo" curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.75.0 @@ -199,15 +199,15 @@ jobs: with: submodules: recursive - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: adopt java-version: 17 cache: gradle - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.22' - name: Build run: | export HOMEBREW_BIN=${{ env.HOMEBREW_BIN }} @@ -296,7 +296,7 @@ jobs: name: gnark native build artifacts path: gnark/build/ - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: adopt java-version: 17 diff --git a/build.sh b/build.sh index 4d8c02e3..dfd6bfc4 100755 --- a/build.sh +++ b/build.sh @@ -350,4 +350,4 @@ build_gnark build_jars -exit \ No newline at end of file +exit