CI: test on both ubuntu 20 and 22. Release on ubuntu 20 only.

BartSte · Jan 30, 2024 · 3a61de8 · 3a61de8
1 parent 5b183ea
commit 3a61de8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 26 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build-release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout code
@@ -32,5 +32,4 @@ jobs:
         uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          draft: true
           files: ./build/*.tar.gz
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,36 +5,20 @@ on:
     branches:
       - main
       - develop
+
   pull_request:
     branches:
       - main
       - develop
 
 jobs:
-  run-tests-shared:
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Install dependencies
-        env: 
-          QT_INSTALLER_JWT_TOKEN: ${{ secrets.QT_INSTALLER_JWT_TOKEN }}
-        run: |
-          ./scripts/setup --shared
+  run-tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
 
-      - name: Build project
-        run: |
-          ./scripts/configure -- -DBUILD_TESTING=ON
-          cmake --build ./build
-
-      - name: Run test
-        run: |
-          ctest --test-dir ./build --verbose
-
-  run-tests-static:
-    runs-on: ubuntu-latest
+      matrix:
+        os: [ubuntu-20.04, ubuntu-22.04]
+        flag: [--static, --shared]
 
     steps:
       - name: Checkout code
@@ -44,7 +28,10 @@ jobs:
         env: 
           QT_INSTALLER_JWT_TOKEN: ${{ secrets.QT_INSTALLER_JWT_TOKEN }}
         run: |
-          ./scripts/setup --static
+          echo "Running on ${{ matrix.os }}"
+          echo "With flag ${{ matrix.flag }}"
+          ./scripts/setup ${{ matrix.flag }}
+
 
       - name: Build project
         run: |