Compare commits

..

No commits in common. "1fd5c7ea5e2adacff56823eb30781a381b2c3ec4" and "f4443dce4486aa60bfca9df1f3b6c6337fbfd9b0" have entirely different histories.

2 changed files with 13 additions and 54 deletions

View File

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

View File

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