Merge branch upstream/master

2021-11-28 03:16:36 +02:00
parent e84772f882 6bd7f8816d
commit 7defb52028
326 changed files with 9186 additions and 8099 deletions
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -94,7 +94,7 @@ jobs:
    - name: Test
      run: |
        cd build
-        ctest -j $(nproc)
+        ctest -j $(nproc) --timeout 120

  macos:
    name: Mac OS
@@ -175,5 +175,5 @@ jobs:
    - name: Test
      run: |
        cd build
-        ctest -j $(sysctl -n hw.logicalcpu)
+        ctest -j $(sysctl -n hw.logicalcpu) --timeout 120