debug

mudler · Oct 14, 2023 · 41c0db3 · 41c0db3
1 parent 7b5b5b8
commit 41c0db3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -29,9 +29,16 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install build-essential ffmpeg
-      - uses: eWaterCycle/setup-grpc@v5
-        with:
-          grpc-version: 1.58.0
+          wget -q -O cmake-linux.sh https://github.com/Kitware/CMake/releases/download/v3.19.6/cmake-3.19.6-Linux-x86_64.sh && \
+              chmod +x cmake-linux.sh && \
+              sudo ./cmake-linux.sh --skip-license --prefix=/usr/ && \
+              rm cmake-linux.sh
+
+          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
+
       - name: Build
         id: build
         env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -87,9 +87,15 @@ jobs:
           sudo cp -rfv /build/lib/Linux-$(uname -m)/piper_phonemize/lib/. /usr/lib/ && \
           sudo ln -s /usr/lib/libpiper_phonemize.so /usr/lib/libpiper_phonemize.so.1 && \
           sudo cp -rfv /build/lib/Linux-$(uname -m)/piper_phonemize/include/. /usr/include/
-      - uses: eWaterCycle/setup-grpc@v5
-        with:
-          grpc-version: 1.58.0
+          wget -q -O cmake-linux.sh https://github.com/Kitware/CMake/releases/download/v3.19.6/cmake-3.19.6-Linux-x86_64.sh && \
+              chmod +x cmake-linux.sh && \
+              sudo ./cmake-linux.sh --skip-license --prefix=/usr/ && \
+              rm cmake-linux.sh
+
+          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
       - name: Test
         run: |
           ESPEAK_DATA="/build/lib/Linux-$(uname -m)/piper_phonemize/lib/espeak-ng-data" GO_TAGS="tts stablediffusion" make test

diff --git a/Dockerfile b/Dockerfile
@@ -19,14 +19,17 @@ RUN apt-get update && \
     apt-get install -y ca-certificates cmake curl patch pip
 
 
-RUN apt-get install --no-install-recommends -y build-essential git autoconf libtool wget unzip zlib1g-dev pkg-config cmake
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.1/protoc-3.19.1-linux-x86_64.zip  -O protobuf.zip \
-    && unzip protobuf.zip && rm protobuf.zip && \
-    cp bin/protoc /usr/local/bin/ && \
-    cp -r include/* /usr/local/include/ && \
-    git clone --depth 1 https://github.com/grpc/grpc.git && \
-    cd grpc && git submodule update --depth 1 --init && \
-    mkdir -p cmake/build && cd cmake/build && cmake ../.. && make -j12 install
+RUN apt-get install --no-install-recommends -y build-essential git autoconf libtool wget unzip zlib1g-dev pkg-config 
+
+RUN  wget -q -O cmake-linux.sh https://github.com/Kitware/CMake/releases/download/v3.19.6/cmake-3.19.6-Linux-x86_64.sh && \
+     chmod +x cmake-linux.sh && \
+     ./cmake-linux.sh --skip-license --prefix=/usr/ && \
+     rm cmake-linux.sh
+
+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 \
+       ../.. && make -j12 install
 
 # Use the variables in subsequent instructions
 RUN echo "Target Architecture: $TARGETARCH"