use brew whenever possible

Signed-off-by: Ettore Di Giacinto <[email protected]>
mudler · Oct 14, 2023 · f3fd6b1 · f3fd6b1
1 parent e62042a
commit f3fd6b1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git 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
@@ -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
diff --git 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"