Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-20.04
- macos-11.0
- windows-2019
- ubuntu-22.04
- macos-15
- windows-2022

include:
- os: windows-2019
cmake-generator: -G "Visual Studio 16 2019" -A x64
cmake-install: "choco install -y cmake"
dependencies: |
choco install -y openssl
choco install -y visualstudio2017-workload-vctools
choco upgrade -y visualstudio2017-workload-vctools
make: msbuild countly-tests.vcxproj -t:rebuild -verbosity:diag -property:Configuration=Release && .\Release\countly-tests.exe
- os: macos-11.0
cmake-install: "brew install cmake"
dependencies: "brew install openssl"
- os: windows-2022
cmake-generator: -G "Visual Studio 17 2022" -A x64
cmake-install: "" #Already installed on hosted runner
dependencies: "" #Already installed on hosted runner
make: msbuild countly-tests.vcxproj -t:rebuild -verbosity:diag -property:Configuration=Release && .\Release\countly-tests.exe
- os: macos-15
cmake-install: "" #Already installed on hosted runner
dependencies: "" #Already installed on hosted runner
make: make ./countly-tests && ./countly-tests
- os: ubuntu-20.04
cmake-install: "sudo apt-get update && sudo apt-get install -y cmake"
dependencies: "sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev"
- os: ubuntu-22.04
cmake-install: "" #Already installed on hosted runner
dependencies: |
sudo apt-get update && sudo apt-get install -y \
libcurl4-openssl-dev \
libssl-dev
make: make ./countly-tests && ./countly-tests

steps:
Expand All @@ -52,11 +52,13 @@ jobs:
run: ${{ matrix.dependencies }}

- name: Set up MSVC
if: matrix.os == 'windows-2019'
if: matrix.os == 'windows-2022'
uses: microsoft/setup-msbuild@v1

- name: Build and run tests
run: |
cmake -DCOUNTLY_BUILD_TESTS=1 -B build . ${{ matrix.cmake-generator }}
cd build
${{ matrix.make }}
env:
CMAKE_POLICY_VERSION_MINIMUM: 3.31
3 changes: 3 additions & 0 deletions tests/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
#include <string>

#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
#ifdef __APPLE__
#define DOCTEST_CONFIG_NO_BREAK_INTO_DEBUGGER
#endif

#include "doctest.h"

Expand Down
2 changes: 1 addition & 1 deletion vendor/doctest
Loading