From f3fd6b1817d76302f1bf8b15b55aeda541484aca Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sat, 14 Oct 2023 19:02:12 +0200 Subject: [PATCH] use brew whenever possible Signed-off-by: Ettore Di Giacinto --- .github/workflows/release.yaml | 5 +---- .github/workflows/test.yml | 5 +---- Dockerfile | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 166e5564db25..7823cb3ea8df 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -74,10 +74,7 @@ jobs: go-version: '>=1.21.0' - name: Dependencies run: | - 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 \ - ../.. && sudo make -j12 install + brew install grpc abseil - name: Build id: build env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index df6c94f5621e..824a63638c8c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -115,10 +115,7 @@ jobs: run: go version - name: Dependencies run: | - 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 \ - ../.. && sudo make -j12 install + brew install grpc abseil - name: Test run: | CMAKE_ARGS="-DLLAMA_F16C=OFF -DLLAMA_AVX512=OFF -DLLAMA_AVX2=OFF -DLLAMA_FMA=OFF" make test \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1e1a58eab5d1..e4ae307cf6be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN git clone --recurse-submodules -b v1.58.0 --depth 1 --shallow-submodules htt cd grpc && mkdir -p cmake/build && cd cmake/build && cmake -DgRPC_INSTALL=ON \ -DgRPC_BUILD_TESTS=OFF \ ../.. && make -j12 install - +RUN rm -rf grpc # Use the variables in subsequent instructions RUN echo "Target Architecture: $TARGETARCH" RUN echo "Target Variant: $TARGETVARIANT"