From 1e84dab9c758a94a6669c93fdd3778ed04633d5b Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 17 Oct 2021 14:14:16 +0200 Subject: [PATCH 01/21] build on Windows --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4389a57..bd4a28d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - os: [ubuntu-latest, macOS-latest] + os: [ubuntu-latest, macOS-latest, windows-latest] steps: - uses: actions/checkout@v1 From 00ac077e2fe5f728a5d6ab57d9db45612ec0f9a1 Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 11:21:47 +0200 Subject: [PATCH 02/21] increase version of checkout to v2 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bd4a28d..b28717e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: os: [ubuntu-latest, macOS-latest, windows-latest] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Set up Python uses: actions/setup-python@v1 with: From 4af9d123ce544b6600eb5bab926db55750acfd6c Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 11:28:49 +0200 Subject: [PATCH 03/21] rename file Windows does not permit to create a file with the name 'aux' with some ending --- tests/unit/{aux.cpp => auxiliary.cpp} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/unit/{aux.cpp => auxiliary.cpp} (100%) diff --git a/tests/unit/aux.cpp b/tests/unit/auxiliary.cpp similarity index 100% rename from tests/unit/aux.cpp rename to tests/unit/auxiliary.cpp From 767ade76dec666cf3f11b9a456aae7fd477dd0ae Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 12:12:17 +0200 Subject: [PATCH 04/21] install boost from MarkusJx/install-boost --- .github/workflows/test.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b28717e..db80e3e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,21 +13,13 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 + - name: Install boost + uses: MarkusJx/install-boost@v2.3.0 + id: install-boost with: - python-version: '3.x' - - name: install conan - run: | - pip install conan - conan profile new default --detect - - name: Change libcxx to libstdc++11 on Linux - run: conan profile update settings.compiler.libcxx=libstdc++11 default - if: ${{ runner.os == 'Linux' }} - - name: install dependencies - run: conan install boost/1.75.0@ --generator=cmake_paths --build=missing -o boost:shared=True + boost_version: 1.73.0 - name: cmake - run: cmake . -DCMAKE_TOOLCHAIN_FILE=./conan_paths.cmake + run: cmake . - name: cmake build run: cmake --build . - name: ctest From 27fe07bd6209c9d8a55523bffd145e6930f64219 Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 12:15:46 +0200 Subject: [PATCH 05/21] set BOOST_ROOT --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index db80e3e..2fc40e9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,6 +22,8 @@ jobs: run: cmake . - name: cmake build run: cmake --build . + env: + BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} - name: ctest run: ctest env: From 8ad931320e5b3f72ba41cac7f051b6052edb7da3 Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 12:17:25 +0200 Subject: [PATCH 06/21] set boost directories explicitly --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2fc40e9..3dd531a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,10 @@ jobs: - name: cmake run: cmake . - name: cmake build - run: cmake --build . + run: | + cmake --build . \ + -DBoost_INCLUDE_DIR=${{steps.install-boost.outputs.BOOST_ROOT}}/include \ + -DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}/lib env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} - name: ctest From e6b6219be4b3bed1f31bd2b2278dff578db3af0b Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 12:18:03 +0200 Subject: [PATCH 07/21] fix typo --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3dd531a..4725d7a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,8 +23,8 @@ jobs: - name: cmake build run: | cmake --build . \ - -DBoost_INCLUDE_DIR=${{steps.install-boost.outputs.BOOST_ROOT}}/include \ - -DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}/lib + -DBoost_INCLUDE_DIR=${{steps.install-boost.outputs.BOOST_ROOT}}/include \ + -DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}/lib env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} - name: ctest From 9fc3e4005b720a0e90661a14a9ee203a8ead2440 Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 12:22:41 +0200 Subject: [PATCH 08/21] use boost dirs in configure step --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4725d7a..b5c192f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,14 +19,14 @@ jobs: with: boost_version: 1.73.0 - name: cmake - run: cmake . - - name: cmake build run: | - cmake --build . \ - -DBoost_INCLUDE_DIR=${{steps.install-boost.outputs.BOOST_ROOT}}/include \ - -DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}/lib + cmake . \ + -DBoost_INCLUDE_DIR=${BOOST_ROOT}/include \ + -DBoost_LIBRARY_DIRS=${BOOST_ROOT}/lib env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} + - name: cmake build + run: cmake --build . - name: ctest run: ctest env: From ed906f6ec988acfdccf44cbfb5dec524279c928f Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 12:29:26 +0200 Subject: [PATCH 09/21] fix powershell issue --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b5c192f..eb592ae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,8 +21,8 @@ jobs: - name: cmake run: | cmake . \ - -DBoost_INCLUDE_DIR=${BOOST_ROOT}/include \ - -DBoost_LIBRARY_DIRS=${BOOST_ROOT}/lib + -DBoost_INCLUDE_DIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/include \ + -DBoost_LIBRARY_DIRS=${{ steps.install-boost.outputs.BOOST_ROOT }}/lib env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} - name: cmake build From 4a873fa7d2f2b2fa08f3dc38764308b2a90fc96e Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 12:33:33 +0200 Subject: [PATCH 10/21] remove path specification for powershell --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eb592ae..b54990c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,9 +20,7 @@ jobs: boost_version: 1.73.0 - name: cmake run: | - cmake . \ - -DBoost_INCLUDE_DIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/include \ - -DBoost_LIBRARY_DIRS=${{ steps.install-boost.outputs.BOOST_ROOT }}/lib + cmake . env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} - name: cmake build From 239ab3c63f6093adb0db71b69b75ea4a89e4503b Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 12:41:10 +0200 Subject: [PATCH 11/21] simplify --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b54990c..407773c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,8 +19,7 @@ jobs: with: boost_version: 1.73.0 - name: cmake - run: | - cmake . + run: cmake . env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} - name: cmake build From 3207d6ba58b864026cd748a455dff6ca140d2be5 Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 23:09:42 +0200 Subject: [PATCH 12/21] update to 1.79.0 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 407773c..8d48832 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: uses: MarkusJx/install-boost@v2.3.0 id: install-boost with: - boost_version: 1.73.0 + boost_version: 1.79.0 - name: cmake run: cmake . env: From 3b8da159e00364dbc5929457d88fd8fec8a9ebb7 Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 23:27:44 +0200 Subject: [PATCH 13/21] distinguish between Windows and non-Windows OSes --- .github/workflows/test.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8d48832..073d659 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,11 +13,19 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Install boost + - name: Install boost on Linux/MacOS uses: MarkusJx/install-boost@v2.3.0 id: install-boost with: boost_version: 1.79.0 + if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }} + - name: Install boost on Windows + uses: MarkusJx/install-boost@v2.3.0 + id: install-boost + with: + boost_version: 1.79.0 + toolset: msvc + if: ${{ runner.os == 'Windows' }} - name: cmake run: cmake . env: From d283ce66cd6ad7038d6c239b007ea5dda4d260eb Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Sun, 15 May 2022 23:32:20 +0200 Subject: [PATCH 14/21] Revert "distinguish between Windows and non-Windows OSes" This reverts commit 3b8da159e00364dbc5929457d88fd8fec8a9ebb7. --- .github/workflows/test.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 073d659..8d48832 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,19 +13,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Install boost on Linux/MacOS + - name: Install boost uses: MarkusJx/install-boost@v2.3.0 id: install-boost with: boost_version: 1.79.0 - if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }} - - name: Install boost on Windows - uses: MarkusJx/install-boost@v2.3.0 - id: install-boost - with: - boost_version: 1.79.0 - toolset: msvc - if: ${{ runner.os == 'Windows' }} - name: cmake run: cmake . env: From 19d8d83d060d09ceb340c81a5a518326d35e31ef Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Mon, 16 May 2022 08:08:26 +0200 Subject: [PATCH 15/21] use windows-2019 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8d48832..d43cb8e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-latest, macOS-latest, windows-2019] steps: - uses: actions/checkout@v2 From d718068ee0dc57f89e0727fd135e10567bf94099 Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Mon, 16 May 2022 08:21:40 +0200 Subject: [PATCH 16/21] Revert "use windows-2019" This reverts commit 19d8d83d060d09ceb340c81a5a518326d35e31ef. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d43cb8e..8d48832 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-2019] + os: [ubuntu-latest, macOS-latest, windows-latest] steps: - uses: actions/checkout@v2 From 27b09c46ada7f7e568cbbb0e7b927c1f256110dc Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Tue, 17 May 2022 08:08:33 +0200 Subject: [PATCH 17/21] adding separate windows job --- .github/workflows/test.yml | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8d48832..02b102f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,14 +3,33 @@ name: test on: [push] jobs: - test: - + test_unix: + name: Test on Unix-like operating systems runs-on: ${{ matrix.os }} - strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-latest, macOS-latest] + steps: + - uses: actions/checkout@v2 + - name: Install boost + uses: MarkusJx/install-boost@v2.3.0 + id: install-boost + with: + boost_version: 1.79.0 + - name: cmake + run: cmake . + env: + BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} + - name: cmake build + run: cmake --build . + - name: ctest + run: ctest + env: + CTEST_OUTPUT_ON_FAILURE: 1 + test_windows: + name: Test on Windows Server 2022 + runs-on: windows-2022 steps: - uses: actions/checkout@v2 - name: Install boost @@ -18,6 +37,8 @@ jobs: id: install-boost with: boost_version: 1.79.0 + platform_version: 2022 + toolset: msvc - name: cmake run: cmake . env: From e1380358d025cc54730ba2c778a37874cd0357e2 Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Tue, 17 May 2022 08:48:49 +0200 Subject: [PATCH 18/21] pass include and lib dirs explicitly in Windows --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 02b102f..d0cd365 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,9 @@ jobs: platform_version: 2022 toolset: msvc - name: cmake - run: cmake . + run: cmake . \ + -DBoost_INCLUDE_DIR=${{steps.install-boost.outputs.BOOST_ROOT}}\include \ + -DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}\lib env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} - name: cmake build From f0a02c32fd43d3ef3431a7d3d53d575877c7a226 Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Tue, 17 May 2022 08:52:34 +0200 Subject: [PATCH 19/21] adding | command --- .github/workflows/test.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d0cd365..76ab15e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,9 +40,10 @@ jobs: platform_version: 2022 toolset: msvc - name: cmake - run: cmake . \ - -DBoost_INCLUDE_DIR=${{steps.install-boost.outputs.BOOST_ROOT}}\include \ - -DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}\lib + run: | + cmake . \ + -DBoost_INCLUDE_DIR=${{steps.install-boost.outputs.BOOST_ROOT}}\include \ + -DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}\lib env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} - name: cmake build From 7a3fc27ac8ba30ee97c24fdc02382ff1311c037e Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Tue, 17 May 2022 08:59:24 +0200 Subject: [PATCH 20/21] wrap paths in "" --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 76ab15e..c52ad3e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,9 +41,7 @@ jobs: toolset: msvc - name: cmake run: | - cmake . \ - -DBoost_INCLUDE_DIR=${{steps.install-boost.outputs.BOOST_ROOT}}\include \ - -DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}\lib + cmake . -DBoost_INCLUDE_DIR="${{steps.install-boost.outputs.BOOST_ROOT}}\include" -DBoost_LIBRARY_DIRS="${{steps.install-boost.outputs.BOOST_ROOT}}\lib" env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} - name: cmake build From 2e40eceb18f1218c08d9874a58bde9cd7160e8f9 Mon Sep 17 00:00:00 2001 From: Alexander Voigt Date: Tue, 17 May 2022 21:13:41 +0200 Subject: [PATCH 21/21] use shared libs --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c52ad3e..0623edd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,6 +37,7 @@ jobs: id: install-boost with: boost_version: 1.79.0 + link: shared platform_version: 2022 toolset: msvc - name: cmake