Skip to content

Commit 4165868

Browse files
authored
Merge pull request #137 from Countly/update_runners
feat: update runners
2 parents 74ae31c + 8dcf335 commit 4165868

File tree

3 files changed

+24
-19
lines changed

3 files changed

+24
-19
lines changed

.github/workflows/tests.yml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os:
17-
- ubuntu-20.04
18-
- macos-11.0
19-
- windows-2019
17+
- ubuntu-22.04
18+
- macos-15
19+
- windows-2022
2020

2121
include:
22-
- os: windows-2019
23-
cmake-generator: -G "Visual Studio 16 2019" -A x64
24-
cmake-install: "choco install -y cmake"
25-
dependencies: |
26-
choco install -y openssl
27-
choco install -y visualstudio2017-workload-vctools
28-
choco upgrade -y visualstudio2017-workload-vctools
29-
make: msbuild countly-tests.vcxproj -t:rebuild -verbosity:diag -property:Configuration=Release && .\Release\countly-tests.exe
30-
- os: macos-11.0
31-
cmake-install: "brew install cmake"
32-
dependencies: "brew install openssl"
22+
- os: windows-2022
23+
cmake-generator: -G "Visual Studio 17 2022" -A x64
24+
cmake-install: "" #Already installed on hosted runner
25+
dependencies: "" #Already installed on hosted runner
26+
make: msbuild countly-tests.vcxproj -t:rebuild -verbosity:diag -property:Configuration=Release && .\Release\countly-tests.exe
27+
- os: macos-15
28+
cmake-install: "" #Already installed on hosted runner
29+
dependencies: "" #Already installed on hosted runner
3330
make: make ./countly-tests && ./countly-tests
34-
- os: ubuntu-20.04
35-
cmake-install: "sudo apt-get update && sudo apt-get install -y cmake"
36-
dependencies: "sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev"
31+
- os: ubuntu-22.04
32+
cmake-install: "" #Already installed on hosted runner
33+
dependencies: |
34+
sudo apt-get update && sudo apt-get install -y \
35+
libcurl4-openssl-dev \
36+
libssl-dev
3737
make: make ./countly-tests && ./countly-tests
3838

3939
steps:
@@ -52,11 +52,13 @@ jobs:
5252
run: ${{ matrix.dependencies }}
5353

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

5858
- name: Build and run tests
5959
run: |
6060
cmake -DCOUNTLY_BUILD_TESTS=1 -B build . ${{ matrix.cmake-generator }}
6161
cd build
6262
${{ matrix.make }}
63+
env:
64+
CMAKE_POLICY_VERSION_MINIMUM: 3.31

tests/main.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#include <string>
77

88
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
9+
#ifdef __APPLE__
10+
#define DOCTEST_CONFIG_NO_BREAK_INTO_DEBUGGER
11+
#endif
912

1013
#include "doctest.h"
1114

vendor/doctest

0 commit comments

Comments
 (0)