once more

hrantzsch · May 21, 2024 · 460a2f5 · 460a2f5
1 parent bc4b1fb
commit 460a2f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 32 deletions.
diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
@@ -2,14 +2,16 @@ name: Check Format
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
 
 jobs:
   check_format:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run clang-format
         run: clang-format --dry-run --Werror include/keychain/*.h src/*.cpp
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,35 +33,8 @@ jobs:
       - name: Build and run tests
         run: cmake --build . --target test --config ${{ matrix.config }}
 
-  # unix-test:
-  #   runs-on: ${{ matrix.os }}
-  #   strategy:
-  #     matrix:
-  #       os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-11, macos-12, macos-13, macos-14]
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #
-  #     - name: Install dependencies
-  #       run: |
-  #         if [ ${{ runner.os }} == 'Linux' ]; then
-  #           sudo apt-get install dbus-x11 dbus gnome-keyring libsecret-1-dev gcovr
-  #         elif [ ${{ runner.os }} == 'macOS' ]; then
-  #           brew install gcovr
-  #         fi
-  #
-  #     - name: Run cmake
-  #       run: cmake . -DBUILD_TESTS=yes -DCODE_COVERAGE=no -DCMAKE_BUILD_TYPE=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
-
   unix-test-and-coverage:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os.image }}
     strategy:
       matrix:
         os: