diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f7ded775ef8f..5e472f96369e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -74,14 +74,19 @@ jobs: go-version: '>=1.21.0' - name: Dependencies run: | - brew install grpc abseil protobuf autoconf automake libtool pkg-config + git clone --recurse-submodules -b v1.58.0 --depth 1 --shallow-submodules https://github.com/grpc/grpc && \ + cd grpc && mkdir -p cmake/build && cd cmake/build && cmake -DgRPC_INSTALL=ON \ + -DgRPC_BUILD_TESTS=OFF \ + ../.. && make -j12 install && rm -rf grpc - name: Build id: build env: CMAKE_ARGS: "${{ matrix.defines }}" BUILD_ID: "${{ matrix.build }}" run: | - CMAKE_PREFIX_PATH=/usr/local/Cellar/protobuf/24.3 make dist + export C_INCLUDE_PATH=/usr/local/include + export CPLUS_INCLUDE_PATH=/usr/local/include + make dist - uses: actions/upload-artifact@v3 with: name: ${{ matrix.build }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 593a3b922540..605b24f37121 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -120,22 +120,12 @@ jobs: run: go version - name: Dependencies run: | - export MY_INSTALL_DIR=$HOME/.local - mkdir -p $MY_INSTALL_DIR - export PATH="$MY_INSTALL_DIR/bin:$PATH" - brew install autoconf automake libtool pkg-config - git clone --recurse-submodules -b v1.58.0 --depth 1 --shallow-submodules https://github.com/grpc/grpc - cd grpc - mkdir -p cmake/build - pushd cmake/build - cmake -DgRPC_INSTALL=ON \ + git clone --recurse-submodules -b v1.58.0 --depth 1 --shallow-submodules https://github.com/grpc/grpc && \ + cd grpc && mkdir -p cmake/build && cd cmake/build && cmake -DgRPC_INSTALL=ON \ -DgRPC_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=$MY_INSTALL_DIR \ - ../.. - make -j 4 - make install - popd + ../.. && make -j12 install && rm -rf grpc - name: Test run: | - export MY_INSTALL_DIR=$HOME/.local - CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$MY_INSTALL_DIR -DLLAMA_F16C=OFF -DLLAMA_AVX512=OFF -DLLAMA_AVX2=OFF -DLLAMA_FMA=OFF" make test \ No newline at end of file + export C_INCLUDE_PATH=/usr/local/include + export CPLUS_INCLUDE_PATH=/usr/local/include + CMAKE_ARGS="-DLLAMA_F16C=OFF -DLLAMA_AVX512=OFF -DLLAMA_AVX2=OFF -DLLAMA_FMA=OFF" make test \ No newline at end of file