yolo

rizesql · Apr 17, 2024 · 6377f48 · 6377f48
1 parent 4d718da
commit 6377f48
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 28 deletions.
diff --git a/.github/actions/configure-cmake/action.yml b/.github/actions/configure-cmake/action.yml
@@ -36,25 +36,30 @@ runs:
         key: ${{ matrix.os }}-${{ matrix.cxx }}-ninja-cache-${{ hashFiles('CMakeLists.txt') }}
         restore-keys: ${{ matrix.os }}-${{ matrix.cxx }}-ninja-cache-
 
-    - name: Install Protobuf (Linux)
-      if: runner.os == 'Linux'
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y --no-install-recommends \
-          libprotobuf-dev libprotoc-dev protobuf-compiler
-      shell: bash
-
-    - name: Install Protobuf (macOS)
-      if: runner.os == 'macOS'
-      run: |
-        brew install protobuf
-      shell: bash
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v3
+      with:
+        version: "23.x"
 
-    - name: Install Protobuf (Windows)
-      if: runner.os == 'Windows'
-      run: |
-        choco install protoc
-      shell: bash
+#    - name: Install Protobuf (Linux)
+#      if: runner.os == 'Linux'
+#      run: |
+#        sudo apt-get update
+#        sudo apt-get install -y --no-install-recommends \
+#          libprotobuf-dev libprotoc-dev protobuf-compiler
+#      shell: bash
+#
+#    - name: Install Protobuf (macOS)
+#      if: runner.os == 'macOS'
+#      run: |
+#        brew install protobuf
+#      shell: bash
+#
+#    - name: Install Protobuf (Windows)
+#      if: runner.os == 'Windows'
+#      run: |
+#        choco install protoc
+#      shell: bash
 
     - run: |
           CMAKE_GENERATOR=${{ matrix.cmake_generator }} cmake -S ${GITHUB_WORKSPACE} -B ${{ env.BUILD_DIR }} \

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -49,11 +49,16 @@ jobs:
           sudo apt-get update
           sudo apt-get install --no-install-recommends cppcheck
 
-      - name: Install protobuf
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends \
-          libprotobuf-dev libprotoc-dev protobuf-compiler
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v3
+        with:
+          version: "23.x"
+
+#      - name: Install protobuf
+#        run: |
+#          sudo apt-get update
+#          sudo apt-get install -y --no-install-recommends \
+#          libprotobuf-dev libprotoc-dev protobuf-compiler
 
       # The flag CMAKE_EXPORT_COMPILE_COMMANDS generates compile_commands.json
       # which is used by cppcheck and clang-tidy
@@ -97,11 +102,16 @@ jobs:
           sudo apt-get update
           sudo apt-get install --no-install-recommends clang-tidy-17 libc++-17-dev libc++abi-17-dev
 
-      - name: Install protobuf
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends \
-          libprotobuf-dev libprotoc-dev protobuf-compiler=3.15.0
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v3
+        with:
+          version: "23.x"
+
+#      - name: Install protobuf
+#        run: |
+#          sudo apt-get update
+#          sudo apt-get install -y --no-install-recommends \
+#          libprotobuf-dev libprotoc-dev protobuf-compiler=3.15.0
 
       - name: Configure CMake
         uses: ./.github/actions/configure-cmake