.github/workflows/cmake.yml

@@ -66,11 +66,8 @@ jobs:
         run: ./test.sh -w
 
   macos:
-    runs-on: macos-${{ matrix.osver }}
-    strategy:
-      fail-fast: false
-      matrix:
-        osver: [12, 13]
+    name: macos/clang
+    runs-on: macos-latest
     steps:
       - name: Checkout Drogon source code
         uses: actions/checkout@v4
@@ -79,8 +76,8 @@ jobs:
           fetch-depth: 0
 
       - name: Install dependencies
-        # Already installed: brotli, zlib, lz4, sqlite3
-        run: brew install ninja jsoncpp mariadb hiredis redis spdlog postgresql@14
+        # Already installed: brotli, zlib, postgresql@14, lz4, sqlite3
+        run: brew install ninja jsoncpp mariadb hiredis redis spdlog
 
       - name: Create Build Environment & Configure Cmake
         # Some projects don't allow in-source building, so create a separate build directory
@@ -117,44 +114,18 @@ jobs:
         run: ./test.sh -t
 
   ubuntu:
+    name: ${{ matrix.buildname }}
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        link: [SHARED, STATIC]
-        compiler:
-          - cxx: g++
-            ver: 9
-          - cxx: g++
-            ver: 10
-          - cxx: g++
-            ver: 11
-          - cxx: g++
-            ver: 12
-          - cxx: g++
-            ver: 13
-          - cxx: clang++
-            ver: 11
-          - cxx: clang++
-            ver: 12
-          - cxx: clang++
-            ver: 13
-          - cxx: clang++
-            ver: 14
-          - cxx: clang++
-            ver: 15
-          - cxx: clang++
-            ver: 16
-          - cxx: clang++
-            ver: 17
         include:
-          - link: STATIC
-            compiler:
-              cxx: g++
-              ver: 13
-              feature: coroutines
-    env:
-      CXX: ${{ matrix.compiler.cxx }}-${{ matrix.compiler.ver }}
+          - buildname: "ubuntu-22.04/gcc"
+            link: SHARED
+          - buildname: "ubuntu-22.04/gcc"
+            link: STATIC
+          - buildname: "ubuntu-22.04/coroutines"
+            link: STATIC
     steps:
       - name: Checkout Drogon source code
         uses: actions/checkout@v4
@@ -176,17 +147,6 @@ jobs:
           sudo apt-get --purge remove postgresql postgresql-doc postgresql-common postgresql-client-common
           sudo apt-get -y install postgresql-all
 
-      - name: Install Clang
-        if: startsWith(matrix.compiler.cxx, 'clang') && matrix.compiler.ver < 13
-        run: sudo apt-get install clang-${{ matrix.compiler.ver }}
-
-      - name: Install Clang
-        if: startsWith(matrix.compiler.cxx, 'clang') && matrix.compiler.ver >= 13
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x ./llvm.sh
-          sudo ./llvm.sh ${{ matrix.compiler.ver }}
-
       - name: Export `shared`
         run: |
           [[ ${{ matrix.link }} == "SHARED" ]] && shared="ON" || shared="OFF"
@@ -195,7 +155,7 @@ jobs:
       - name: Create Build Environment & Configure Cmake
         # Some projects don't allow in-source building, so create a separate build directory
         # We'll use this as our working directory for all subsequent commands
-        if: matrix.compiler.feature != 'coroutines'
+        if: matrix.buildname != 'ubuntu-22.04/coroutines'
         run: |
           cmake -B build -G Ninja          \
             -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
@@ -205,7 +165,7 @@ jobs:
       - name: Create Build Environment & Configure Cmake (coroutines)
         # Some projects don't allow in-source building, so create a separate build directory
         # We'll use this as our working directory for all subsequent commands
-        if: matrix.compiler.feature == 'coroutines'
+        if: matrix.buildname == 'ubuntu-22.04/coroutines'
         run: |
           cmake -B build -G Ninja            \
             -DCMAKE_BUILD_TYPE=$BUILD_TYPE   \

orm_lib/tests/db_listener_test.cc

@@ -79,7 +79,6 @@ DROGON_TEST(ListenNotifyTest)
         dbListener->unlisten(chan);
     }
     CHECK(numNotifications == 15);
-    std::this_thread::sleep_for(1s);
 }
 #endif