Test in CI

skupperproject · Jun 1, 2022 · e37a107 · e37a107
1 parent 6cf1da2
commit e37a107
Showing 1 changed file with 16 additions and 35 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -611,35 +611,9 @@ jobs:
         working-directory: ${{env.DispatchBuildDir}}
         run: ctest -VV -R python-checker
 
-  container:
-    name: Container image
-    runs-on: ubuntu-latest
-    steps:
-
-      - uses: actions/checkout@v3
-
-      - name: Build Containerfile
-        run: |
-          docker build -t local/skupper-router:local -f ./Containerfile .
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-
-      - uses: Swatinem/rust-cache@v1
-
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: -- --nocapture
-        env:
-          QDROUTERD_IMAGE: local/skupper-router:local
-          RUST_BACKTRACE: 1
-
-  rpm:
-    name: 'Build and test RPM (${{ matrix.container }}:${{ matrix.containerTag }})'
-    runs-on: '${{ matrix.os }}'
+  clang:
+    name: 'Clang (${{ matrix.os }})'
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ 'ubuntu-20.04' ]
@@ -664,10 +638,12 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Deploy the spec.rpkg file to /
-        run: ln -s packaging/skupper-router.spec.rpkg ./
+      - name: Install latest stable Clang
+        run: |
+          sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
-      - name: Install build dependencies (2/2)
+      - name: Install Linux build dependencies
+        if: ${{ runner.os == 'Linux' }}
         run: |
           rpkg spec --outdir /tmp/rpkg
           dnf builddep --setopt=tsflags=nodocs --setopt=install_weak_deps=False -y /tmp/rpkg/skupper-router.spec
@@ -677,9 +653,14 @@ jobs:
           mkdir /tmp/skupper-rpms
           rpkg local --nocheck --outdir /tmp/skupper-rpms
 
-      - name: Install built packages
-        run: |
-          dnf install -y /tmp/skupper-rpms/*/*.rpm
+      - name: skupper-router cmake configure
+        working-directory: ${{env.RouterBuildDir}}
+        run: >
+          cmake "${{github.workspace}}" \
+            "-DCMAKE_C_COMPILER=clang" \
+            "-DCMAKE_CXX_COMPILER=clang++" \
+            "-DCMAKE_INSTALL_PREFIX=${InstallPrefix}" \
+            ${RouterCMakeExtraArgs}
 
       - name: Check skrouterd version
         run: |