almost there

hrantzsch · May 21, 2024 · 6222c49 · 6222c49
1 parent 460a2f5
commit 6222c49
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,15 +43,23 @@ jobs:
             coverage: no
           }
           - {
-            image: macos-12,
+            image: ubuntu-22.04,
             coverage: no
           }
           - {
-            image: ubuntu-latest,
+            image: ubuntu-24.04,
             coverage: yes
           }
           - {
-            image: macos-latest,
+            image: macos-12,
+            coverage: no
+          }
+          - {
+            image: macos-13,
+            coverage: no
+          }
+          - {
+            image: macos-14,
             coverage: yes
           }
     steps:
@@ -61,6 +69,9 @@ jobs:
         run: |
           if [ ${{ runner.os }} == 'Linux' ]; then
             sudo apt-get install dbus-x11 dbus gnome-keyring libsecret-1-dev gcovr
+            # prepare the keyring
+            eval $(DISPLAY=:99.0 dbus-launch --sh-syntax)
+            echo "somepassword" | gnome-keyring-daemon -r -d --unlock
           elif [ ${{ runner.os }} == 'macOS' ]; then
             brew install gcovr
           fi
@@ -72,12 +83,7 @@ jobs:
             -DCMAKE_BUILD_TYPE=${{ matrix.os.coverage == 'yes' && 'Debug' || 'Release' }}
 
       - name: Build and run tests
-        run: |
-          if [ ${{ runner.os }} == 'Linux' ]; then
-            eval $(DISPLAY=:99.0 dbus-launch --sh-syntax)
-            echo "somepassword" | gnome-keyring-daemon -r -d --unlock
-          fi
-          cmake --build . --target test
+        run: cmake --build . --target test
 
       - name: Generate gcovr report
         if: matrix.os.coverage == 'yes'