Adapt Gitea Act Runner

struqt · Oct 23, 2024 · 513c541 · 513c541
1 parent 936a3d3
commit 513c541
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/.github/workflows/_build_base.yml b/.github/workflows/_build_base.yml
@@ -35,7 +35,10 @@ jobs:
         with:
           ref: ${{ inputs.safe-checkout }}
           submodules: 'true'
-
+      - name: Install CMake
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake
       - name: gRPC Cache
         id: cache-grpc
         uses: actions/cache@v4

diff --git a/.github/workflows/_build_cxx.yml b/.github/workflows/_build_cxx.yml
@@ -45,6 +45,10 @@ jobs:
             ${{ github.workspace }}/third-party/build
           key: ${{ env.cache-name }} ${{ runner.os }} ${{ runner.arch }} ${{ matrix.build_type }}
 
+      - name: CMake Installation
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake
       - name: CMake
         if: steps.cache-grpc.outputs.cache-hit == 'true'
         working-directory: ${{ github.workspace }}/demo-cxx
@@ -64,14 +68,14 @@ jobs:
           ctest -C ${{ matrix.build_type }}
 
       - name: Upload demo_cxx_hello
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           retention-days: 10
           name: demo_cxx_hello-gRPC${{ matrix.grpc_version }}-${{ runner.os }}-${{ runner.arch }}
           path: ${{ github.workspace }}/demo-cxx-build/demo_cxx_hello
 
       - name: Upload demo_cxx_server
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           retention-days: 10
           name: demo_cxx_server-gRPC${{ matrix.grpc_version }}-${{ runner.os }}-${{ runner.arch }}

diff --git a/.github/workflows/_build_rust.yml b/.github/workflows/_build_rust.yml
@@ -28,12 +28,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with: { ref: '${{ inputs.safe-checkout }}' }
+      - name: Setup rustup
+        shell: bash
+        run: |
+          if command -v cargo >/dev/null 2>&1; then
+            echo "Installed"
+          else
+            echo "Installing"
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+            source $HOME/.cargo/env
+          fi
+          which cargo
       - name: Build
         working-directory: ${{ github.workspace }}/demo-rs
-        run: cargo build --verbose
+        run: source $HOME/.cargo/env && cargo build --verbose
       - name: Test
         working-directory: ${{ github.workspace }}/demo-rs
-        run: cargo test --verbose
+        run: source $HOME/.cargo/env && cargo test --verbose
     #steps
   #build
 #jobs
diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Download demo_cxx_hello
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: demo_cxx_hello-gRPC${{ matrix.grpc_version }}-${{ runner.os }}-${{ runner.arch }}
       - name: Test demo_cxx_hello

diff --git a/demo-cxx/CMakeLists.txt b/demo-cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.22)
 project(demo_cxx)
 
 set(CMAKE_CXX_STANDARD 17)