diff --git a/.github/resources/witness-generator/Makefile b/.github/resources/witness-generator/Makefile index 7d26905..15550e3 100644 --- a/.github/resources/witness-generator/Makefile +++ b/.github/resources/witness-generator/Makefile @@ -35,12 +35,12 @@ linux-lib: CXXFLAGS=$(CXXFLAGS_COMMON) -fPIC linux-lib: $(LIB) # ---- macOS ---- -macos: CXXFLAGS=$(CXXFLAGS_COMMON) -I/opt/homebrew/include -include gmp_patch.hpp +macos: CXXFLAGS=$(CXXFLAGS_COMMON) -I/opt/homebrew/include -include gmp_patch.hpp -mmacosx-version-min=11.0 macos: LDFLAGS=-Wl,-search_paths_first -Wl,-dead_strip macos: LDLIBS=/opt/homebrew/lib/libgmp.a macos: $(BIN) -macos-lib: CXXFLAGS=$(CXXFLAGS_COMMON) -fPIC -I/opt/homebrew/include -include gmp_patch.hpp +macos-lib: CXXFLAGS=$(CXXFLAGS_COMMON) -fPIC -I/opt/homebrew/include -include gmp_patch.hpp -mmacosx-version-min=11.0 macos-lib: $(LIB) # ---- Windows (MinGW) ---- diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7dea46..619fc0a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -195,9 +195,15 @@ jobs: working-directory: rapidsnark run: sudo apt update -y + - name: Check GMP Before Deps + run: dpkg -l | grep libgmp || echo "gmp not installed" + - name: Install Dependencies [Prover] run: sudo apt install -y build-essential cmake libgmp-dev libsodium-dev nasm curl m4 + - name: Check GMP After Prover Deps + run: dpkg -l | grep libgmp || echo "gmp not installed" + - name: Install Dependencies [Witness Generator] run: sudo apt install -y nlohmann-json3-dev llvm @@ -440,9 +446,15 @@ jobs: working-directory: rapidsnark run: sudo apt update -y + - name: Check GMP Before Deps + run: dpkg -l | grep libgmp || echo "gmp not installed" + - name: Install Dependencies [Prover] run: sudo apt install -y build-essential cmake libgmp-dev libsodium-dev nasm curl m4 + - name: Check GMP After Prover Deps + run: dpkg -l | grep libgmp || echo "gmp not installed" + - name: Install Dependencies [Witness Generator] run: sudo apt install -y nlohmann-json3-dev llvm @@ -971,12 +983,21 @@ jobs: - name: Setup Dependencies run: mkdir include + - name: Check GMP Before Deps + run: brew list --versions | grep gmp || echo "gmp not installed" + - name: Install Dependencies [Witness Generator] run: brew install nlohmann-json binutils + - name: Check GMP After Witness Generator Deps + run: brew list --versions | grep gmp || echo "gmp not installed" + - name: Install Dependencies [Prover] run: brew install nasm m4 + - name: Check GMP After Prover Deps + run: brew list --versions | grep gmp || echo "gmp not installed" + - name: Cache GMP Archive id: cache-gmp uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4