Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update to macos 13 #178

Merged
merged 4 commits into from
Jun 25, 2024
Merged

chore: update to macos 13 #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1ed881
chore: update to macos 13
ryjones Jun 24, 2024
9994af0
bump to golang 1.22.4
garyschulte Jun 24, 2024
9a2bda9
move to java 21, stick with last upload 3.1.0 action
garyschulte Jun 24, 2024
7524af2
revert to java 17 unti #168 merges
garyschulte Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,4 +350,4 @@ build_gnark


build_jars
exit
exit
Loading