From f9dbaba07643f15ea89e34e813d10ece1a2584dc Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 09:52:12 +0100 Subject: [PATCH 001/130] Github actions for MSVC --- .github/workflows/main.yml | 73 ++++++++++++++------------------------ 1 file changed, 26 insertions(+), 47 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b73dbf6f..941408b3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,61 +1,40 @@ name: CI on: push: - branches: [ master, hotfix/clang-9 ] + branches: [ feature/github-actions-for-windows-compilers ] pull_request: branches: [ master ] jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04, ubuntu-20.04] + + build-visual-studio + runs-on: [windows] steps: - - uses: actions/checkout@v2 - - - name: Setup cmake - run: cmake -DBUILD_TESTS=ON ./ - - - name: Compile - run: make - - - name: Run tests - run: ./test/etl_tests - - - name: Save artifacts - uses: actions/upload-artifact@v2 + - name: Checkout + uses: actions/checkout@v2 with: - name: Testfile - path: test/etl_tests + submodules: recursive + + - name: Installing vcpkg + run: | + cd .. + git clone https://github.com/Microsoft/vcpkg.git + cd vcpkg + git checkout --force 2020.01 + .\bootstrap-vcpkg.bat + .\vcpkg.exe install cppzmq:x64-windows + + - name: Running cmake + run: | + cd ${{ github.workspace }} + mkdir build + cd build + cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }} + /../vcpkg/scripts/buildsystems/vcpkg.cmake - build-clang-9-Linux: - runs-on: ubuntu-18.04 - steps: - - uses: actions/checkout@v2 - name: Build and run run: | - export CC=clang-9 - export CXX=clang++-9 cmake -D BUILD_TESTS=ON ./ - make - ./test/etl_tests - - - name: Save artifacts - uses: actions/upload-artifact@v2 - with: - name: Testfile - path: test/etl_tests - - build-clang-10-osx: - runs-on: macos-10.15 - steps: - - uses: actions/checkout@v2 - - name: Build and run - run: | - export CC=clang - export CXX=clang++ - cmake -D BUILD_TESTS=ON ./ - make - ./test/etl_tests + cd build + MSBuild.exe etl.sln From 367f96552e14745bdb53999ea01729b9631f042f Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 09:53:29 +0100 Subject: [PATCH 002/130] Github actions for MSVC --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 941408b3..885f2a6f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,13 +1,13 @@ name: CI on: push: - branches: [ feature/github-actions-for-windows-compilers ] + branches: [ master, feature/github-actions-for-windows-compilers ] pull_request: branches: [ master ] jobs: - build-visual-studio + build-visual-studio: runs-on: [windows] steps: From 1a3a2ce5cbe3095db2291b4193550ae2bfe684c3 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 09:54:08 +0100 Subject: [PATCH 003/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 885f2a6f..149c8ca5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,7 @@ name: CI on: push: - branches: [ master, feature/github-actions-for-windows-compilers ] + branches: [feature/github-actions-for-windows-compilers ] pull_request: branches: [ master ] From 44e2730baa0cab5e2f365bc88347ce85f692e019 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 09:58:08 +0100 Subject: [PATCH 004/130] Github actions for MSVC --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 149c8ca5..65b753fc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,14 +1,14 @@ name: CI on: push: - branches: [feature/github-actions-for-windows-compilers ] + branches: [ feature/github-actions-for-windows-compilers ] pull_request: branches: [ master ] jobs: build-visual-studio: - runs-on: [windows] + runs-on: windows steps: - name: Checkout From b971037ce5ae046778a98d8cdd3d51620b312644 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:02:06 +0100 Subject: [PATCH 005/130] Github actions for MSVC --- .github/workflows/main.yml | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 65b753fc..fed69926 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ on: jobs: build-visual-studio: - runs-on: windows + runs-on: windows-latest steps: - name: Checkout @@ -16,25 +16,4 @@ jobs: with: submodules: recursive - - name: Installing vcpkg - run: | - cd .. - git clone https://github.com/Microsoft/vcpkg.git - cd vcpkg - git checkout --force 2020.01 - .\bootstrap-vcpkg.bat - .\vcpkg.exe install cppzmq:x64-windows - - name: Running cmake - run: | - cd ${{ github.workspace }} - mkdir build - cd build - cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }} - /../vcpkg/scripts/buildsystems/vcpkg.cmake - - - name: Build and run - run: | - cmake -D BUILD_TESTS=ON ./ - cd build - MSBuild.exe etl.sln From a9d39153e57abf527f1a1105ae07e666c13bacfd Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:03:20 +0100 Subject: [PATCH 006/130] Github actions for MSVC --- .github/workflows/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fed69926..638180f2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,4 +16,13 @@ jobs: with: submodules: recursive + - name: Installing vcpkg + run: | + cd .. + git clone https://github.com/Microsoft/vcpkg.git + cd vcpkg + git checkout --force 2020.01 + .\bootstrap-vcpkg.bat + .\vcpkg.exe install cppzmq:x64-windows + From 9724a0fe3fd58978651ddd6276342559790ec6d7 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:07:52 +0100 Subject: [PATCH 007/130] Github actions for MSVC --- .github/workflows/main.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 638180f2..d516e264 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,4 +25,16 @@ jobs: .\bootstrap-vcpkg.bat .\vcpkg.exe install cppzmq:x64-windows + - name: Running cmake + run: | + cd ${{ github.workspace }} + mkdir build + cd build + cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }} + /../vcpkg/scripts/buildsystems/vcpkg.cmake + - name: Build and run + run: | + cmake -D BUILD_TESTS=ON ./ + cd build + MSBuild.exe etl.sln From c0590bf52d0c074c868123629e8156caf081ae5d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:16:01 +0100 Subject: [PATCH 008/130] Github actions for MSVC --- .github/workflows/main.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d516e264..4285cea4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,22 +16,12 @@ jobs: with: submodules: recursive - - name: Installing vcpkg - run: | - cd .. - git clone https://github.com/Microsoft/vcpkg.git - cd vcpkg - git checkout --force 2020.01 - .\bootstrap-vcpkg.bat - .\vcpkg.exe install cppzmq:x64-windows - - name: Running cmake run: | cd ${{ github.workspace }} mkdir build cd build cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }} - /../vcpkg/scripts/buildsystems/vcpkg.cmake - name: Build and run run: | From 192a851577fa3320833f60afe3e8e4a0d2e82edb Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:18:38 +0100 Subject: [PATCH 009/130] Github actions for MSVC --- .github/workflows/main.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4285cea4..874835b4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,18 +13,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - with: - submodules: recursive - - - name: Running cmake - run: | - cd ${{ github.workspace }} - mkdir build - cd build - cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }} - name: Build and run run: | - cmake -D BUILD_TESTS=ON ./ - cd build MSBuild.exe etl.sln From 346abe9a691b5b64f96a5a6de7a60cc317c40380 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:21:39 +0100 Subject: [PATCH 010/130] Github actions for MSVC --- .github/workflows/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 874835b4..3d118d1f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,6 +14,15 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Installing vcpkg + run: | + cd .. + git clone https://github.com/Microsoft/vcpkg.git + cd vcpkg + git checkout + .\bootstrap-vcpkg.bat + .\vcpkg.exe install cppzmq:x64-windows + - name: Build and run run: | MSBuild.exe etl.sln From d887d110357d2bfee6073c1a2c733c8493155791 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:27:40 +0100 Subject: [PATCH 011/130] Github actions for MSVC --- .github/workflows/main.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3d118d1f..157d1b3e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,15 +14,10 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Installing vcpkg - run: | - cd .. - git clone https://github.com/Microsoft/vcpkg.git - cd vcpkg - git checkout - .\bootstrap-vcpkg.bat - .\vcpkg.exe install cppzmq:x64-windows + - name: Setup MSBuild.exe + uses: warrenbuckley/Setup-MSBuild@v1 - name: Build and run run: | - MSBuild.exe etl.sln + working-directory: test + msbuild etl.sln From e3d23f95bb85b5762c7f64c4c82d9ba698f6fdbc Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:30:13 +0100 Subject: [PATCH 012/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 157d1b3e..d5d6551d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,6 +18,6 @@ jobs: uses: warrenbuckley/Setup-MSBuild@v1 - name: Build and run + working-directory: test run: | - working-directory: test msbuild etl.sln From 731167fff6854d849be770bb6e6b32d2f64bc256 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:32:20 +0100 Subject: [PATCH 013/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d5d6551d..d5dafc6a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,6 +18,6 @@ jobs: uses: warrenbuckley/Setup-MSBuild@v1 - name: Build and run - working-directory: test + working-directory: test/vs2019 run: | msbuild etl.sln From 5cf076d61ed070dcf7bb03fc838c5d4cf9e96a24 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:35:19 +0100 Subject: [PATCH 014/130] Github actions for MSVC --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d5dafc6a..ec09b6eb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,4 +20,5 @@ jobs: - name: Build and run working-directory: test/vs2019 run: | - msbuild etl.sln + msbuild etl.sln /property:Configuration=DebugNoSTL + msbuild etl.sln /property:Configuration=Debug From c4f59bc20024120034212290488fa67e2035958a Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:38:44 +0100 Subject: [PATCH 015/130] Github actions for MSVC --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ec09b6eb..e9d561ed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,5 +20,4 @@ jobs: - name: Build and run working-directory: test/vs2019 run: | - msbuild etl.sln /property:Configuration=DebugNoSTL - msbuild etl.sln /property:Configuration=Debug + msbuild etl.sln /p:Configuration=Debug From 6a2ce5e8c44ad68a14eda365cfa75e46b24cf08c Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:49:24 +0100 Subject: [PATCH 016/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e9d561ed..b94d6241 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,4 +20,4 @@ jobs: - name: Build and run working-directory: test/vs2019 run: | - msbuild etl.sln /p:Configuration=Debug + msbuild etl.sln /p:Configuration=Debug /p:Platform="Any CPU" From 5d9bbf2672e49d2b4729b80ee9c763aa7c730e00 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:52:09 +0100 Subject: [PATCH 017/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b94d6241..f0dcf086 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,4 +20,4 @@ jobs: - name: Build and run working-directory: test/vs2019 run: | - msbuild etl.sln /p:Configuration=Debug /p:Platform="Any CPU" + msbuild etl.sln /p:Configuration="Debug MSVC - No STL" /p:Platform="Any CPU" From 208f0c2fb61b8a9b5d1bb214e9358d1bbacaac70 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 10:57:32 +0100 Subject: [PATCH 018/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f0dcf086..dbb4cca2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,4 +20,4 @@ jobs: - name: Build and run working-directory: test/vs2019 run: | - msbuild etl.sln /p:Configuration="Debug MSVC - No STL" /p:Platform="Any CPU" + msbuild etl.sln /p:Configuration=DebugNoSTL /p:Platform="Any CPU" From 79f3148eb3c4b050da3e1d2bfc4b3c7b4dfc32f6 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 11:06:29 +0100 Subject: [PATCH 019/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dbb4cca2..d5dafc6a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,4 +20,4 @@ jobs: - name: Build and run working-directory: test/vs2019 run: | - msbuild etl.sln /p:Configuration=DebugNoSTL /p:Platform="Any CPU" + msbuild etl.sln From 35a2fc91aa142246c5d7d10970b0e8f326d4f681 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 12:06:40 +0100 Subject: [PATCH 020/130] Github actions for MSVC --- .github/workflows/main.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d5dafc6a..52f004bc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,15 +9,20 @@ jobs: build-visual-studio: runs-on: windows-latest - steps: - - name: Checkout - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - name: Setup MSBuild.exe uses: warrenbuckley/Setup-MSBuild@v1 - name: Build and run - working-directory: test/vs2019 run: | - msbuild etl.sln + cmake -D BUILD_TESTS=ON ./ + make + ./test/etl_tests + + - name: Save artifacts + uses: actions/upload-artifact@v2 + with: + name: Testfile + path: test/etl_tests \ No newline at end of file From fdb0f64ec9f22caf398d128a81f97abcba7bd256 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 12:11:52 +0100 Subject: [PATCH 021/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 52f004bc..fecb25c5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: - name: Build and run run: | cmake -D BUILD_TESTS=ON ./ - make + nmake ./test/etl_tests - name: Save artifacts From 662dd6ea24f2ca315668a362a6ff0b76f1d353ec Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 12:14:51 +0100 Subject: [PATCH 022/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fecb25c5..8f3558a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: - name: Build and run run: | cmake -D BUILD_TESTS=ON ./ - nmake + msbuild ./test/etl_tests - name: Save artifacts From db1a9790e0dfe0999cd9e3b222d32b3bbcb6ce7a Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 12:22:39 +0100 Subject: [PATCH 023/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f3558a3..2eafd615 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: - name: Build and run run: | cmake -D BUILD_TESTS=ON ./ - msbuild + cmake --build . ./test/etl_tests - name: Save artifacts From 1b396679ebcf7768f301c37dfe5baedb489fa5a8 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 19:31:55 +0100 Subject: [PATCH 024/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2eafd615..f3a9a3df 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - name: Build and run run: | - cmake -D BUILD_TESTS=ON ./ + cmake -DBUILD_TESTS=ON -DCMAKE_CXX_COMPILER_ID="MSVC" ./ cmake --build . ./test/etl_tests From 3ea20255e1bc77e77bf759008dc626c79f30415e Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 19:36:12 +0100 Subject: [PATCH 025/130] Github actions for MSVC --- .github/workflows/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f3a9a3df..cee1399f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,9 +17,8 @@ jobs: - name: Build and run run: | - cmake -DBUILD_TESTS=ON -DCMAKE_CXX_COMPILER_ID="MSVC" ./ - cmake --build . - ./test/etl_tests + cmake -DBUILD_TESTS=ON ./ + MSBuild etl.sln - name: Save artifacts uses: actions/upload-artifact@v2 From d2c5b761e53f62929ad179e79435c9c8eb30c1ba Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 19:49:41 +0100 Subject: [PATCH 026/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cee1399f..e31d6fa0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - name: Build and run run: | - cmake -DBUILD_TESTS=ON ./ + cmake ./ MSBuild etl.sln - name: Save artifacts From d6e3db0b9f2762318d4accb3f7b04bc8be0a16af Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 20:00:57 +0100 Subject: [PATCH 027/130] Github actions for MSVC --- .github/workflows/main.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e31d6fa0..3ca9d2bc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,7 @@ name: CI on: push: - branches: [ feature/github-actions-for-windows-compilers ] + branches: [ master, feature/github-actions-for-windows-compilers ] pull_request: branches: [ master ] @@ -20,8 +20,15 @@ jobs: cmake ./ MSBuild etl.sln - - name: Save artifacts - uses: actions/upload-artifact@v2 - with: - name: Testfile - path: test/etl_tests \ No newline at end of file + build-visual-studio-no-stl: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + + - name: Setup MSBuild.exe + uses: warrenbuckley/Setup-MSBuild@v1 + + - name: Build and run + run: | + cmake -DETL_NO_STL ./ + MSBuild etl.sln From 8577e8e5f22ffe6c7dec111ed4383f16ad6b3d74 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 11 Aug 2020 20:04:59 +0100 Subject: [PATCH 028/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ca9d2bc..e71b5e26 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,5 +30,5 @@ jobs: - name: Build and run run: | - cmake -DETL_NO_STL ./ + cmake -DETL_NO_STL=1 ./ MSBuild etl.sln From 2ea9aece4fe9df2a80b9264d1aea2fc497467bdb Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 12 Aug 2020 10:17:51 +0100 Subject: [PATCH 029/130] Github actions for MSVC --- .github/workflows/main.yml | 4 ++-- test/CMakeLists.txt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e71b5e26..4d5366fe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - name: Build and run run: | - cmake ./ + cmake -DNO_STL=0 ./ MSBuild etl.sln build-visual-studio-no-stl: @@ -30,5 +30,5 @@ jobs: - name: Build and run run: | - cmake -DETL_NO_STL=1 ./ + cmake -DNO_STL=1 ./ MSBuild etl.sln diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 06121a05..a948bccd 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,6 +3,10 @@ project(etl_unit_tests) add_definitions(-DETL_DEBUG) +if (NO_STL EQUAL 1) + add_definitions(-DETL_NO_STL) +endif() + if(NOT UnitTest++_FOUND) # Add unittest-cpp as an ExternalProject include(cmake/unit-test_external_project.cmake) From b8389c71348bee12c60d77f2b4c240670e931ea2 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 12 Aug 2020 10:23:56 +0100 Subject: [PATCH 030/130] Github actions for MSVC --- test/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a948bccd..253740f0 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,6 +4,7 @@ project(etl_unit_tests) add_definitions(-DETL_DEBUG) if (NO_STL EQUAL 1) + message(STATUS "Compiling for No STL") add_definitions(-DETL_NO_STL) endif() From dc501fa2c477ee37b79c4dbe6eca0ed92fa96115 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 12 Aug 2020 10:26:39 +0100 Subject: [PATCH 031/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- test/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d5366fe..960df751 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - name: Build and run run: | - cmake -DNO_STL=0 ./ + cmake ./ MSBuild etl.sln build-visual-studio-no-stl: diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 253740f0..a0bebd0e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,7 +3,7 @@ project(etl_unit_tests) add_definitions(-DETL_DEBUG) -if (NO_STL EQUAL 1) +if (${NO_STL}) message(STATUS "Compiling for No STL") add_definitions(-DETL_NO_STL) endif() From bb52c37eca73b114820cb131641397ce9764b85b Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sat, 15 Aug 2020 21:00:18 +0100 Subject: [PATCH 032/130] Fixed issue for incorrect operation of erase(const_iterator, const_iterator) when the terminating iterator was end() for etl::unordered_map, etl::unordered_multimap, etl::unordered_set and etl::unordered_multiset. --- include/etl/unordered_map.h | 29 +++++++++++--------- include/etl/unordered_multimap.h | 25 +++++++++++------ include/etl/unordered_multiset.h | 27 ++++++++++++------- include/etl/unordered_set.h | 27 ++++++++++++------- include/etl/version.h | 2 +- library.json | 2 +- library.properties | 2 +- support/Release notes.txt | 8 +++++- test/test_unordered_map.cpp | 45 +++++++++++++++++++++++++++++++ test/test_unordered_multimap.cpp | 46 ++++++++++++++++++++++++++++++++ test/test_unordered_multiset.cpp | 46 ++++++++++++++++++++++++++++++++ test/test_unordered_set.cpp | 46 ++++++++++++++++++++++++++++++++ test/vs2019/etl.vcxproj | 2 ++ test/vs2019/etl.vcxproj.filters | 6 +++++ 14 files changed, 271 insertions(+), 42 deletions(-) diff --git a/include/etl/unordered_map.h b/include/etl/unordered_map.h index cad0b6d9..2b3c3cf1 100644 --- a/include/etl/unordered_map.h +++ b/include/etl/unordered_map.h @@ -1033,14 +1033,19 @@ namespace etl //********************************************************************* iterator erase(const_iterator first_, const_iterator last_) { - // Make a note of the last. - iterator result((pbuckets + number_of_buckets), last_.get_bucket_list_iterator(), last_.get_local_iterator()); + // Erasing everything? + if ((first_ == begin()) && (last_ == end())) + { + clear(); + return end(); + } // Get the starting point. - bucket_t* pbucket = first_.get_bucket_list_iterator(); - local_iterator iprevious = pbucket->before_begin(); - local_iterator icurrent = first_.get_local_iterator(); - local_iterator iend = last_.get_local_iterator(); // Note: May not be in the same bucket as icurrent. + bucket_t* pbucket = first_.get_bucket_list_iterator(); + bucket_t* pend_bucket = last_.get_bucket_list_iterator(); + local_iterator iprevious = pbucket->before_begin(); + local_iterator icurrent = first_.get_local_iterator(); + local_iterator iend = last_.get_local_iterator(); // Note: May not be in the same bucket as icurrent. // Find the node previous to the first one. while (iprevious->etl_next != &*icurrent) @@ -1048,9 +1053,9 @@ namespace etl ++iprevious; } - while (icurrent != iend) + // Until we reach the end. + while ((icurrent != iend) || (pbucket != pend_bucket)) { - local_iterator inext = pbucket->erase_after(iprevious); // Unlink from the bucket. icurrent->key_value_pair.~value_type(); // Destroy the value. pnodepool->release(&*icurrent); // Release it back to the pool. @@ -1059,8 +1064,8 @@ namespace etl icurrent = inext; - // Are we there yet? - if (icurrent != iend) + // Have we not reached the end? + if ((icurrent != iend) || (pbucket != pend_bucket)) { // At the end of this bucket? if ((icurrent == pbucket->end())) @@ -1072,12 +1077,12 @@ namespace etl } while (pbucket->empty()); iprevious = pbucket->before_begin(); - icurrent = pbucket->begin(); + icurrent = pbucket->begin(); } } } - return result; + return iterator((pbuckets + number_of_buckets), last_.get_bucket_list_iterator(), last_.get_local_iterator()); } //************************************************************************* diff --git a/include/etl/unordered_multimap.h b/include/etl/unordered_multimap.h index fffa8a8d..f1dc9bac 100644 --- a/include/etl/unordered_multimap.h +++ b/include/etl/unordered_multimap.h @@ -909,14 +909,22 @@ namespace etl //********************************************************************* iterator erase(const_iterator first_, const_iterator last_) { + // Erasing everything? + if ((first_ == begin()) && (last_ == end())) + { + clear(); + return end(); + } + // Make a note of the last. iterator result((pbuckets + number_of_buckets), last_.get_bucket_list_iterator(), last_.get_local_iterator()); // Get the starting point. - bucket_t* pbucket = first_.get_bucket_list_iterator(); - local_iterator iprevious = pbucket->before_begin(); - local_iterator icurrent = first_.get_local_iterator(); - local_iterator iend = last_.get_local_iterator(); // Note: May not be in the same bucket as icurrent. + bucket_t* pbucket = first_.get_bucket_list_iterator(); + bucket_t* pend_bucket = last_.get_bucket_list_iterator(); + local_iterator iprevious = pbucket->before_begin(); + local_iterator icurrent = first_.get_local_iterator(); + local_iterator iend = last_.get_local_iterator(); // Note: May not be in the same bucket as icurrent. // Find the node previous to the first one. while (iprevious->etl_next != &*icurrent) @@ -924,7 +932,8 @@ namespace etl ++iprevious; } - while (icurrent != iend) + // Until we reach the end. + while ((icurrent != iend) || (pbucket != pend_bucket)) { local_iterator inext = pbucket->erase_after(iprevious); // Unlink from the bucket. @@ -935,8 +944,8 @@ namespace etl icurrent = inext; - // Are we there yet? - if (icurrent != iend) + // Have we not reached the end? + if ((icurrent != iend) || (pbucket != pend_bucket)) { // At the end of this bucket? if ((icurrent == pbucket->end())) @@ -948,7 +957,7 @@ namespace etl } while (pbucket->empty()); iprevious = pbucket->before_begin(); - icurrent = pbucket->begin(); + icurrent = pbucket->begin(); } } } diff --git a/include/etl/unordered_multiset.h b/include/etl/unordered_multiset.h index decc866e..677a5b1c 100644 --- a/include/etl/unordered_multiset.h +++ b/include/etl/unordered_multiset.h @@ -894,22 +894,31 @@ namespace etl //********************************************************************* iterator erase(const_iterator first_, const_iterator last_) { + // Erasing everything? + if ((first_ == begin()) && (last_ == end())) + { + clear(); + return end(); + } + // Make a note of the last. iterator result((pbuckets + number_of_buckets), last_.get_bucket_list_iterator(), last_.get_local_iterator()); // Get the starting point. - bucket_t* pbucket = first_.get_bucket_list_iterator(); - local_iterator iprevious = pbucket->before_begin(); - local_iterator icurrent = first_.get_local_iterator(); - local_iterator iend = last_.get_local_iterator(); // Note: May not be in the same bucket as icurrent. + bucket_t* pbucket = first_.get_bucket_list_iterator(); + bucket_t* pend_bucket = last_.get_bucket_list_iterator(); + local_iterator iprevious = pbucket->before_begin(); + local_iterator icurrent = first_.get_local_iterator(); + local_iterator iend = last_.get_local_iterator(); // Note: May not be in the same bucket as icurrent. - // Find the node previous to the first one. + // Find the node previous to the first one. while (iprevious->etl_next != &*icurrent) { ++iprevious; } - while (icurrent != iend) + // Until we reach the end. + while ((icurrent != iend) || (pbucket != pend_bucket)) { local_iterator inext = pbucket->erase_after(iprevious); // Unlink from the bucket. @@ -920,8 +929,8 @@ namespace etl icurrent = inext; - // Are we there yet? - if (icurrent != iend) + // Have we not reached the end? + if ((icurrent != iend) || (pbucket != pend_bucket)) { // At the end of this bucket? if ((icurrent == pbucket->end())) @@ -933,7 +942,7 @@ namespace etl } while (pbucket->empty()); iprevious = pbucket->before_begin(); - icurrent = pbucket->begin(); + icurrent = pbucket->begin(); } } } diff --git a/include/etl/unordered_set.h b/include/etl/unordered_set.h index b6257127..4e4322c3 100644 --- a/include/etl/unordered_set.h +++ b/include/etl/unordered_set.h @@ -912,22 +912,31 @@ namespace etl //********************************************************************* iterator erase(const_iterator first_, const_iterator last_) { + // Erasing everything? + if ((first_ == begin()) && (last_ == end())) + { + clear(); + return end(); + } + // Make a note of the last. iterator result((pbuckets + number_of_buckets), last_.get_bucket_list_iterator(), last_.get_local_iterator()); // Get the starting point. - bucket_t* pbucket = first_.get_bucket_list_iterator(); - local_iterator iprevious = pbucket->before_begin(); - local_iterator icurrent = first_.get_local_iterator(); - local_iterator iend = last_.get_local_iterator(); // Note: May not be in the same bucket as icurrent. + bucket_t* pbucket = first_.get_bucket_list_iterator(); + bucket_t* pend_bucket = last_.get_bucket_list_iterator(); + local_iterator iprevious = pbucket->before_begin(); + local_iterator icurrent = first_.get_local_iterator(); + local_iterator iend = last_.get_local_iterator(); // Note: May not be in the same bucket as icurrent. - // Find the node previous to the first one. + // Find the node previous to the first one. while (iprevious->etl_next != &*icurrent) { ++iprevious; } - while (icurrent != iend) + // Until we reach the end. + while ((icurrent != iend) || (pbucket != pend_bucket)) { local_iterator inext = pbucket->erase_after(iprevious); // Unlink from the bucket. @@ -938,8 +947,8 @@ namespace etl icurrent = inext; - // Are we there yet? - if (icurrent != iend) + // Have we not reached the end? + if ((icurrent != iend) || (pbucket != pend_bucket)) { // At the end of this bucket? if ((icurrent == pbucket->end())) @@ -951,7 +960,7 @@ namespace etl } while (pbucket->empty()); iprevious = pbucket->before_begin(); - icurrent = pbucket->begin(); + icurrent = pbucket->begin(); } } } diff --git a/include/etl/version.h b/include/etl/version.h index 93d64b4a..07c33a62 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -39,7 +39,7 @@ SOFTWARE. #define ETL_VERSION_MAJOR 18 #define ETL_VERSION_MINOR 12 -#define ETL_VERSION_PATCH 4 +#define ETL_VERSION_PATCH 5 #define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_U16 ETL_STRINGIFY(ETL_VERSION_MAJOR) u"." ETL_STRINGIFY(ETL_VERSION_MINOR) u"." ETL_STRINGIFY(ETL_VERSION_PATCH) diff --git a/library.json b/library.json index ad2a269f..f024aaba 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Embedded Template Library", - "version": "18.12.4", + "version": "18.12.5", "authors": { "name": "John Wellbelove", "email": "john.wellbelove@etlcpp.com" diff --git a/library.properties b/library.properties index f28974df..6deb9856 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library -version=18.12.4 +version=18.12.5 author= John Wellbelove maintainer=John Wellbelove license=MIT diff --git a/support/Release notes.txt b/support/Release notes.txt index 6e7cfa7d..360d40d4 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,9 @@ +=============================================================================== +18.12.5 +Fixed issue for incorrect operation of erase(const_iterator, const_iterator) when +the terminating iterator was end() for etl::unordered_map, etl::unordered_multimap, +etl::unordered_set and etl::unordered_multiset. + =============================================================================== 18.12.4 Resolve clang 9 compatibility issues. @@ -84,7 +90,7 @@ Allows set_callback() function to be given run-time and compile-time pointers to =============================================================================== 18.3.4 -Changed std::move to etl::move in std::optional and std::queue +Changed std::move to etl::move in etl::optional and etl::queue Fixed etl::span subspan with etl::dynamic_extent =============================================================================== diff --git a/test/test_unordered_map.cpp b/test/test_unordered_map.cpp index 658e4985..72b36e51 100644 --- a/test/test_unordered_map.cpp +++ b/test/test_unordered_map.cpp @@ -628,6 +628,51 @@ namespace CHECK(idata != data.end()); } + //************************************************************************* + TEST_FIXTURE(SetupFixture, test_erase_range_first_half) + { + DataNDC data(initial_data.begin(), initial_data.end()); + + DataNDC::iterator end = data.begin(); + etl::advance(end, data.size() / 2); + + auto itr = data.erase(data.begin(), end); + + CHECK_EQUAL(initial_data.size() / 2, data.size()); + CHECK(!data.full()); + CHECK(!data.empty()); + CHECK(itr == end); + } + + //************************************************************************* + TEST_FIXTURE(SetupFixture, test_erase_range_last_half) + { + DataNDC data(initial_data.begin(), initial_data.end()); + + DataNDC::iterator begin = data.begin(); + etl::advance(begin, data.size() / 2); + + auto itr = data.erase(begin, data.end()); + + CHECK_EQUAL(initial_data.size() / 2, data.size()); + CHECK(!data.full()); + CHECK(!data.empty()); + CHECK(itr == data.end()); + } + + //************************************************************************* + TEST_FIXTURE(SetupFixture, test_erase_range_all) + { + DataNDC data(initial_data.begin(), initial_data.end()); + + auto itr = data.erase(data.begin(), data.end()); + + CHECK_EQUAL(0U, data.size()); + CHECK(!data.full()); + CHECK(data.empty()); + CHECK(itr == data.end()); + } + //************************************************************************* TEST_FIXTURE(SetupFixture, test_clear) { diff --git a/test/test_unordered_multimap.cpp b/test/test_unordered_multimap.cpp index ea6f53b9..95d16f46 100644 --- a/test/test_unordered_multimap.cpp +++ b/test/test_unordered_multimap.cpp @@ -541,6 +541,52 @@ namespace CHECK(idata != data.end()); } + //************************************************************************* + TEST_FIXTURE(SetupFixture, test_erase_range_first_half) + { + DataNDC data(initial_data.begin(), initial_data.end()); + + DataNDC::iterator end = data.begin(); + etl::advance(end, data.size() / 2); + + auto itr = data.erase(data.begin(), end); + + CHECK_EQUAL(initial_data.size() / 2, data.size()); + CHECK(!data.full()); + CHECK(!data.empty()); + CHECK(itr == end); + } + + //************************************************************************* + TEST_FIXTURE(SetupFixture, test_erase_range_last_half) + { + DataNDC data(initial_data.begin(), initial_data.end()); + + DataNDC::iterator begin = data.begin(); + etl::advance(begin, data.size() / 2); + + auto itr = data.erase(begin, data.end()); + + CHECK_EQUAL(initial_data.size() / 2, data.size()); + CHECK(!data.full()); + CHECK(!data.empty()); + CHECK(itr == data.end()); + } + + //************************************************************************* + TEST_FIXTURE(SetupFixture, test_erase_range_all) + { + DataNDC data(initial_data.begin(), initial_data.end()); + + auto itr = data.erase(data.begin(), data.end()); + + CHECK_EQUAL(0U, data.size()); + CHECK(!data.full()); + CHECK(data.empty()); + CHECK(itr == data.end()); + } + + //************************************************************************* TEST_FIXTURE(SetupFixture, test_clear) { diff --git a/test/test_unordered_multiset.cpp b/test/test_unordered_multiset.cpp index 6e47557f..6dbb3dc7 100644 --- a/test/test_unordered_multiset.cpp +++ b/test/test_unordered_multiset.cpp @@ -479,6 +479,52 @@ namespace CHECK(idata != data.end()); } + //************************************************************************* + TEST_FIXTURE(SetupFixture, test_erase_range_first_half) + { + DataNDC data(initial_data.begin(), initial_data.end()); + + DataNDC::iterator end = data.begin(); + etl::advance(end, data.size() / 2); + + auto itr = data.erase(data.begin(), end); + + CHECK_EQUAL(initial_data.size() / 2, data.size()); + CHECK(!data.full()); + CHECK(!data.empty()); + CHECK(itr == end); + } + + //************************************************************************* + TEST_FIXTURE(SetupFixture, test_erase_range_last_half) + { + DataNDC data(initial_data.begin(), initial_data.end()); + + DataNDC::iterator begin = data.begin(); + etl::advance(begin, data.size() / 2); + + auto itr = data.erase(begin, data.end()); + + CHECK_EQUAL(initial_data.size() / 2, data.size()); + CHECK(!data.full()); + CHECK(!data.empty()); + CHECK(itr == data.end()); + } + + //************************************************************************* + TEST_FIXTURE(SetupFixture, test_erase_range_all) + { + DataNDC data(initial_data.begin(), initial_data.end()); + + auto itr = data.erase(data.begin(), data.end()); + + CHECK_EQUAL(0U, data.size()); + CHECK(!data.full()); + CHECK(data.empty()); + CHECK(itr == data.end()); + } + + //************************************************************************* TEST_FIXTURE(SetupFixture, test_clear) { diff --git a/test/test_unordered_set.cpp b/test/test_unordered_set.cpp index f55cd41c..5d316dd0 100644 --- a/test/test_unordered_set.cpp +++ b/test/test_unordered_set.cpp @@ -459,6 +459,52 @@ namespace CHECK(idata != data.end()); } + //************************************************************************* + TEST_FIXTURE(SetupFixture, test_erase_range_first_half) + { + DataNDC data(initial_data.begin(), initial_data.end()); + + DataNDC::iterator end = data.begin(); + etl::advance(end, data.size() / 2); + + auto itr = data.erase(data.begin(), end); + + CHECK_EQUAL(initial_data.size() / 2, data.size()); + CHECK(!data.full()); + CHECK(!data.empty()); + CHECK(itr == end); + } + + //************************************************************************* + TEST_FIXTURE(SetupFixture, test_erase_range_last_half) + { + DataNDC data(initial_data.begin(), initial_data.end()); + + DataNDC::iterator begin = data.begin(); + etl::advance(begin, data.size() / 2); + + auto itr = data.erase(begin, data.end()); + + CHECK_EQUAL(initial_data.size() / 2, data.size()); + CHECK(!data.full()); + CHECK(!data.empty()); + CHECK(itr == data.end()); + } + + //************************************************************************* + TEST_FIXTURE(SetupFixture, test_erase_range_all) + { + DataNDC data(initial_data.begin(), initial_data.end()); + + auto itr = data.erase(data.begin(), data.end()); + + CHECK_EQUAL(0U, data.size()); + CHECK(!data.full()); + CHECK(data.empty()); + CHECK(itr == data.end()); + } + + //************************************************************************* TEST_FIXTURE(SetupFixture, test_clear) { diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj index 59eb876a..262d2618 100644 --- a/test/vs2019/etl.vcxproj +++ b/test/vs2019/etl.vcxproj @@ -1687,9 +1687,11 @@ + + diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters index f10c59f7..849cf756 100644 --- a/test/vs2019/etl.vcxproj.filters +++ b/test/vs2019/etl.vcxproj.filters @@ -1444,6 +1444,9 @@ Resource Files\CI\Github + + Resource Files\Make + @@ -1458,6 +1461,9 @@ Resource Files + + Resource Files\Make + From 7d7dd89c703dcc6d23a8d0c83b727cc9df7b71f5 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 11:32:23 +0100 Subject: [PATCH 033/130] Fixed issue for incorrect operation of erase(const_iterator, const_iterator) when the terminating iterator was end() for etl::unordered_map, etl::unordered_multimap, etl::unordered_set and etl::unordered_multiset. --- include/etl/unordered_multimap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/etl/unordered_multimap.h b/include/etl/unordered_multimap.h index f1dc9bac..8810bc8a 100644 --- a/include/etl/unordered_multimap.h +++ b/include/etl/unordered_multimap.h @@ -926,7 +926,7 @@ namespace etl local_iterator icurrent = first_.get_local_iterator(); local_iterator iend = last_.get_local_iterator(); // Note: May not be in the same bucket as icurrent. - // Find the node previous to the first one. + // Find the node previous to the first one. while (iprevious->etl_next != &*icurrent) { ++iprevious; From 7dc4f772360cebb43df3901c0129007f8f17930a Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 14:41:42 +0100 Subject: [PATCH 034/130] Github actions for MSVC --- .github/workflows/main.yml | 4 ++-- test/CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 960df751..7a7ab76e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,7 @@ name: CI on: push: - branches: [ master, feature/github-actions-for-windows-compilers ] + branches: [ feature/github-actions-for-windows-compilers ] pull_request: branches: [ master ] @@ -30,5 +30,5 @@ jobs: - name: Build and run run: | - cmake -DNO_STL=1 ./ + cmake -DNO_STL=ON ./ MSBuild etl.sln diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a0bebd0e..1cbd99a0 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,7 +3,9 @@ project(etl_unit_tests) add_definitions(-DETL_DEBUG) -if (${NO_STL}) +option(NO_STL "No STL" OFF) + +if (NO_STL) message(STATUS "Compiling for No STL") add_definitions(-DETL_NO_STL) endif() From cebf7ea072e4e101695d011afcf77ec21aacad81 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 15:12:30 +0100 Subject: [PATCH 035/130] Github actions for MSVC --- test/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1cbd99a0..21fa6000 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -8,6 +8,8 @@ option(NO_STL "No STL" OFF) if (NO_STL) message(STATUS "Compiling for No STL") add_definitions(-DETL_NO_STL) +else() + message(STATUS "Compiling for STL") endif() if(NOT UnitTest++_FOUND) From 8e154a75ce86a4baa0e5c8497519f663c0eca66f Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 15:33:56 +0100 Subject: [PATCH 036/130] Github actions for MSVC --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7a7ab76e..f9b65795 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - name: Build and run run: | - cmake ./ + cmake -DENABLE_TESTS=ON ./ MSBuild etl.sln build-visual-studio-no-stl: @@ -30,5 +30,5 @@ jobs: - name: Build and run run: | - cmake -DNO_STL=ON ./ + cmake -DENABLE_TESTS=ON -DNO_STL=ON ./ MSBuild etl.sln From 4b485bc038e1624023af604fa2403107dfbe877f Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 15:45:58 +0100 Subject: [PATCH 037/130] Github actions for MSVC --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f9b65795..87f039e4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - name: Build and run run: | - cmake -DENABLE_TESTS=ON ./ + cmake -DBUILD_TESTS=ON ./ MSBuild etl.sln build-visual-studio-no-stl: @@ -30,5 +30,5 @@ jobs: - name: Build and run run: | - cmake -DENABLE_TESTS=ON -DNO_STL=ON ./ + cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ MSBuild etl.sln From 32b003629cc6bfa08ad17561324f3df5bcb5cd27 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 18:54:11 +0100 Subject: [PATCH 038/130] Github actions for MSVC --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 87f039e4..78762c64 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: - name: Build and run run: | cmake -DBUILD_TESTS=ON ./ - MSBuild etl.sln + MSBuild etl.sln /property:Configuration=Debug build-visual-studio-no-stl: runs-on: windows-latest @@ -31,4 +31,4 @@ jobs: - name: Build and run run: | cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ - MSBuild etl.sln + MSBuild etl.sln /property:Configuration=Debug From d592d059139eb7818a8c975e9e0e84ff8f07cda8 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 18:59:30 +0100 Subject: [PATCH 039/130] Github actions for MSVC --- include/etl/platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/etl/platform.h b/include/etl/platform.h index 6e075bd2..13c9df63 100644 --- a/include/etl/platform.h +++ b/include/etl/platform.h @@ -38,7 +38,7 @@ SOFTWARE. #define ETL_8BIT_SUPPORT (CHAR_BIT == 8) // Define a debug macro -#if defined(_DEBUG) || defined(DEBUG) +#if (defined(_DEBUG) || defined(DEBUG)) && !defined(ETL_DEBUG) #define ETL_DEBUG #endif From 99200936817d794172a02e832373f16094fae26e Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 19:03:05 +0100 Subject: [PATCH 040/130] Github actions for MSVC --- test/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 21fa6000..8603b33b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -172,10 +172,10 @@ set(TEST_SOURCE_FILES test_xor_rotate_checksum.cpp ) -if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") - list(APPEND TEST_SOURCE_FILES "test_atomic_gcc_sync.cpp") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") -endif() +#if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") +# list(APPEND TEST_SOURCE_FILES "test_atomic_gcc_sync.cpp") +# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") +#endif() add_executable(etl_tests ${TEST_SOURCE_FILES} ) From 2c10a814e9a1838f11acbc3d6e026123a8a1375e Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 19:06:56 +0100 Subject: [PATCH 041/130] Github actions for MSVC --- test/CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8603b33b..c2b8ead3 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -28,7 +28,6 @@ set(TEST_SOURCE_FILES test_array.cpp test_array_view.cpp test_array_wrapper.cpp - test_atomic_gcc_sync.cpp test_atomic_std.cpp test_binary.cpp test_bitset.cpp @@ -172,10 +171,10 @@ set(TEST_SOURCE_FILES test_xor_rotate_checksum.cpp ) -#if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") -# list(APPEND TEST_SOURCE_FILES "test_atomic_gcc_sync.cpp") -# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") -#endif() +if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") + list(APPEND TEST_SOURCE_FILES "test_atomic_gcc_sync.cpp") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") +endif() add_executable(etl_tests ${TEST_SOURCE_FILES} ) From 63e35414933b19d178b6729e9db737473d505956 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 19:18:43 +0100 Subject: [PATCH 042/130] Github actions for MSVC --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 78762c64..f15d72bb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,6 +19,7 @@ jobs: run: | cmake -DBUILD_TESTS=ON ./ MSBuild etl.sln /property:Configuration=Debug + ./etl.exe build-visual-studio-no-stl: runs-on: windows-latest @@ -30,5 +31,6 @@ jobs: - name: Build and run run: | - cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ - MSBuild etl.sln /property:Configuration=Debug + cmake -DBUILD_TESTS=ON ./ + MSBuild etl.sln /property:Configuration=DebugNoSTL + ./etl.exe From 347565bb802b416f15e7860592279a0c62be3610 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 19:24:40 +0100 Subject: [PATCH 043/130] Github actions for MSVC --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f15d72bb..b5b75af7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: - name: Build and run run: | cmake -DBUILD_TESTS=ON ./ - MSBuild etl.sln /property:Configuration=Debug + MSBuild etl.sln /property:Configuration=Debug /p:Platform="Win32" ./etl.exe build-visual-studio-no-stl: @@ -32,5 +32,5 @@ jobs: - name: Build and run run: | cmake -DBUILD_TESTS=ON ./ - MSBuild etl.sln /property:Configuration=DebugNoSTL + MSBuild etl.sln /property:Configuration=DebugNoSTL /p:Platform="Win32" ./etl.exe From 49735baa6d1940dd52d72b7f14333f364afa95a1 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 19:27:45 +0100 Subject: [PATCH 044/130] Github actions for MSVC --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b5b75af7..c96dd05c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: - name: Build and run run: | cmake -DBUILD_TESTS=ON ./ - MSBuild etl.sln /property:Configuration=Debug /p:Platform="Win32" + MSBuild etl.sln /property:Configuration=Debug /property:Platform="x86" ./etl.exe build-visual-studio-no-stl: @@ -32,5 +32,5 @@ jobs: - name: Build and run run: | cmake -DBUILD_TESTS=ON ./ - MSBuild etl.sln /property:Configuration=DebugNoSTL /p:Platform="Win32" + MSBuild etl.sln /property:Configuration=DebugNoSTL /property:Platform="x86" ./etl.exe From 6e649f98ba4a95713b0c0b09272ff2591dbcb0c5 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 16 Aug 2020 19:55:16 +0100 Subject: [PATCH 045/130] Github actions for MSVC --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c96dd05c..088d1ba1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,8 +18,8 @@ jobs: - name: Build and run run: | cmake -DBUILD_TESTS=ON ./ - MSBuild etl.sln /property:Configuration=Debug /property:Platform="x86" - ./etl.exe + MSBuild etl.sln /property:Configuration=Debug /property:Platform="Any CPU" + Debug/etl.exe build-visual-studio-no-stl: runs-on: windows-latest @@ -32,5 +32,5 @@ jobs: - name: Build and run run: | cmake -DBUILD_TESTS=ON ./ - MSBuild etl.sln /property:Configuration=DebugNoSTL /property:Platform="x86" - ./etl.exe + MSBuild etl.sln /property:Configuration=DebugNoSTL /property:Platform="Any CPU" + DebugNoSTL/etl.exe From 609a7008d7e2400940dd99e89e07afc796b53a62 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Mon, 17 Aug 2020 16:26:48 +0100 Subject: [PATCH 046/130] Github actions for MSVC --- .github/workflows/main.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 088d1ba1..fe83cc56 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,18 +19,5 @@ jobs: run: | cmake -DBUILD_TESTS=ON ./ MSBuild etl.sln /property:Configuration=Debug /property:Platform="Any CPU" - Debug/etl.exe + dir - build-visual-studio-no-stl: - runs-on: windows-latest - steps: - - uses: actions/checkout@v2 - - - name: Setup MSBuild.exe - uses: warrenbuckley/Setup-MSBuild@v1 - - - name: Build and run - run: | - cmake -DBUILD_TESTS=ON ./ - MSBuild etl.sln /property:Configuration=DebugNoSTL /property:Platform="Any CPU" - DebugNoSTL/etl.exe From 063eae98782a51236294b96d05539ed5c23fe6ec Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Mon, 17 Aug 2020 16:39:40 +0100 Subject: [PATCH 047/130] Github actions for MSVC --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe83cc56..9f3c5105 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,6 +18,7 @@ jobs: - name: Build and run run: | cmake -DBUILD_TESTS=ON ./ - MSBuild etl.sln /property:Configuration=Debug /property:Platform="Any CPU" + cd test/vs2019 dir + MSBuild etl.sln /property:Configuration=Debug /property:Platform="Any CPU" From 67a67c18a32ef2b9ed2e4d2b1e894a0e88f7a6af Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Mon, 17 Aug 2020 16:43:14 +0100 Subject: [PATCH 048/130] Github actions for MSVC --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9f3c5105..9d566ce7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,5 +20,5 @@ jobs: cmake -DBUILD_TESTS=ON ./ cd test/vs2019 dir - MSBuild etl.sln /property:Configuration=Debug /property:Platform="Any CPU" + MSBuild etl.sln /property:Configuration="Debug" /property:Platform="Win32" From f5290d896b814b5c912d12b0a7bb52248993b182 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 29 Sep 2020 09:58:04 +0100 Subject: [PATCH 049/130] Github CI update --- .github/workflows/main.yml | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d620336f..87101b69 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,47 +15,44 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup cmake - run: cmake -DBUILD_TESTS=ON ./ - - - name: Compile - run: make + - name: name: Build and run + run: | + cmake -DBUILD_TESTS=ON ./ + gcc --version + make - name: Run tests run: ./test/etl_tests - - - name: Save artifacts - uses: actions/upload-artifact@v2 - with: - name: Testfile - path: test/etl_tests build-clang-9-Linux: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 + - name: Build and run run: | export CC=clang-9 export CXX=clang++-9 cmake -D BUILD_TESTS=ON ./ + clang --version make - ./test/etl_tests - - name: Save artifacts - uses: actions/upload-artifact@v2 - with: - name: Testfile - path: test/etl_tests + - name: Run tests + run: ./test/etl_tests build-clang-10-osx: runs-on: macos-10.15 steps: - uses: actions/checkout@v2 + - name: Build and run run: | export CC=clang export CXX=clang++ cmake -D BUILD_TESTS=ON ./ + clang --version make - ./test/etl_tests + + - name: Run tests + run: ./test/etl_tests + From c6f327f4bfc0c85bd65c60622f032acc0227294a Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 29 Sep 2020 12:51:23 +0100 Subject: [PATCH 050/130] Conditionally disable template deduction guide tests --- test/vs2019/etl.vcxproj | 1 + test/vs2019/etl.vcxproj.filters | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj index 20160357..f3b511ab 100644 --- a/test/vs2019/etl.vcxproj +++ b/test/vs2019/etl.vcxproj @@ -1868,6 +1868,7 @@ + diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters index 5e960783..d4ddadfb 100644 --- a/test/vs2019/etl.vcxproj.filters +++ b/test/vs2019/etl.vcxproj.filters @@ -82,6 +82,9 @@ {586d2c92-e504-4dea-9b1f-42d725a5272c} + + {74399f00-a7a3-47e3-9b27-d01fb2b5ce87} + @@ -1456,6 +1459,9 @@ Resource Files\Make + + Resource Files\CI\Appveyor + From 57e6969f033b8fc27f016c20506e22f2a35ae89d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 29 Sep 2020 12:53:46 +0100 Subject: [PATCH 051/130] Conditionally disable template deduction guide tests --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eca65b45..1da10f94 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,7 @@ name: CI on: push: - branches: [ hotfix/fix-ci-errors] + branches: [ master ] pull_request: branches: [ master ] From 9c664eb484c1ead2d7efd2ab045a6eef664be789 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 29 Sep 2020 12:57:03 +0100 Subject: [PATCH 052/130] Conditionally disable template deduction guide tests --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1da10f94..63c0d4c3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,11 +6,11 @@ on: branches: [ master ] jobs: - build: + build-gcc-linux: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-18.04, ubuntu-20.04] steps: - uses: actions/checkout@v2 @@ -24,7 +24,7 @@ jobs: - name: Run tests run: ./test/etl_tests - build-clang-9-Linux: + build-clang-9-linux: runs-on: ${{ matrix.os }} strategy: matrix: From 9d45d7b867457565f0c0c17215f689c2ab5f9b1f Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 29 Sep 2020 13:00:51 +0100 Subject: [PATCH 053/130] Conditionally disable template deduction guide tests --- test/etl_profile.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/etl_profile.h b/test/etl_profile.h index 64f6f7d4..4b032bab 100644 --- a/test/etl_profile.h +++ b/test/etl_profile.h @@ -105,6 +105,10 @@ SOFTWARE. #include "../include/etl/profiles/determine_development_os.h" +#if defined(ETL_COMPILER_GCC) && (ETL_COMPILER_VERSION < 8) + #define ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED +#endif + #if defined(ETL_DEVELOPMENT_OS_WINDOWS) #define ETL_TARGET_OS_WINDOWS #elif defined(ETL_DEVELOPMENT_OS_LINUX) From e337689ed0ebdb1bd282d5cdb2daaefe16a191d2 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 29 Sep 2020 13:15:37 +0100 Subject: [PATCH 054/130] Conditionally disable template deduction guide tests --- include/etl/version.h | 2 +- library.json | 2 +- library.properties | 2 +- support/Release notes.txt | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/etl/version.h b/include/etl/version.h index 623aedce..183fbee5 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -39,7 +39,7 @@ SOFTWARE. #define ETL_VERSION_MAJOR 18 #define ETL_VERSION_MINOR 16 -#define ETL_VERSION_PATCH 0 +#define ETL_VERSION_PATCH 1 #define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_U16 ETL_STRINGIFY(ETL_VERSION_MAJOR) u"." ETL_STRINGIFY(ETL_VERSION_MINOR) u"." ETL_STRINGIFY(ETL_VERSION_PATCH) diff --git a/library.json b/library.json index 5965c324..c72f55bc 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Embedded Template Library", - "version": "18.16.0", + "version": "18.16.1", "authors": { "name": "John Wellbelove", "email": "john.wellbelove@etlcpp.com" diff --git a/library.properties b/library.properties index 7e169f6d..444646b9 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library -version=18.16.0 +version=18.16.1 author= John Wellbelove maintainer=John Wellbelove license=MIT diff --git a/support/Release notes.txt b/support/Release notes.txt index 909902e6..7fced63a 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,7 @@ +=============================================================================== +18.16.1 +Updates to CI configuration files. + =============================================================================== 18.16.0 Added template deduction guides for most containers. From b99b52c39dcae34ae7ac5daaedd21b9b62bb2bd8 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 29 Sep 2020 19:52:00 +0100 Subject: [PATCH 055/130] Update main.yml --- .github/workflows/main.yml | 59 ++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d566ce7..e2a6141c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,24 +1,65 @@ name: CI on: push: - branches: [ feature/github-actions-for-windows-compilers ] + branches: [ master ] pull_request: branches: [ master ] jobs: + build-gcc-linux: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] - build-visual-studio: - runs-on: windows-latest steps: - uses: actions/checkout@v2 - - name: Setup MSBuild.exe - uses: warrenbuckley/Setup-MSBuild@v1 - - name: Build and run run: | cmake -DBUILD_TESTS=ON ./ - cd test/vs2019 - dir - MSBuild etl.sln /property:Configuration="Debug" /property:Platform="Win32" + gcc --version + make + + - name: Run tests + run: ./test/etl_tests + build-clang-9-linux: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build and run + run: | + export CC=clang-9 + export CXX=clang++-9 + cmake -D BUILD_TESTS=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-10-osx: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-10.15] + + steps: + - uses: actions/checkout@v2 + + - name: Build and run + run: | + export CC=clang + export CXX=clang++ + cmake -D BUILD_TESTS=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests From 8296ec2b5c78283a5f3e4e75624505eacb3dc319 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 29 Sep 2020 20:05:33 +0100 Subject: [PATCH 056/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 63c0d4c3..1acff0b3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,11 +1,44 @@ name: CI on: push: - branches: [ master ] + branches: [ feature/github-actions-for-windows-compilers ] pull_request: branches: [ master ] jobs: + +Windows: + name: build-windows-vs2019 + runs-on: [windows] + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: recursive + + - name: Installing vcpkg + run: | + cd .. + git clone https://github.com/Microsoft/vcpkg.git + cd vcpkg + git checkout --force 2020.01 + .\bootstrap-vcpkg.bat + .\vcpkg.exe install cppzmq:x64-windows + + - name: Build and run + run: | + cd ${{ github.workspace }} + mkdir build + cd build + cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }} + /../vcpkg/scripts/buildsystems/vcpkg.cmake + cd build + MSBuild.exe etl.sln /property:Configuration=Debug + + - name: Run tests + run: ./test/etl_tests + build-gcc-linux: runs-on: ${{ matrix.os }} strategy: From c27f14479b246d68aa07f0513f9343206275e199 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Sep 2020 11:27:44 +0100 Subject: [PATCH 057/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 128 ++++++++++++++++++++++++++----------- 1 file changed, 92 insertions(+), 36 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1acff0b3..586b0cd8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,44 +1,12 @@ name: CI on: push: + branches: [ branches: [ feature/github-actions-for-windows-compilers ] pull_request: branches: [ master ] jobs: - -Windows: - name: build-windows-vs2019 - runs-on: [windows] - - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - submodules: recursive - - - name: Installing vcpkg - run: | - cd .. - git clone https://github.com/Microsoft/vcpkg.git - cd vcpkg - git checkout --force 2020.01 - .\bootstrap-vcpkg.bat - .\vcpkg.exe install cppzmq:x64-windows - - - name: Build and run - run: | - cd ${{ github.workspace }} - mkdir build - cd build - cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }} - /../vcpkg/scripts/buildsystems/vcpkg.cmake - cd build - MSBuild.exe etl.sln /property:Configuration=Debug - - - name: Run tests - run: ./test/etl_tests - build-gcc-linux: runs-on: ${{ matrix.os }} strategy: @@ -48,7 +16,7 @@ Windows: steps: - uses: actions/checkout@v2 - - name: Build and run + - name: Build run: | cmake -DBUILD_TESTS=ON ./ gcc --version @@ -57,6 +25,24 @@ Windows: - name: Run tests run: ./test/etl_tests + build-gcc-linux-no-stl: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ + gcc --version + make + + - name: Run tests + run: ./test/etl_tests + build-clang-9-linux: runs-on: ${{ matrix.os }} strategy: @@ -66,7 +52,7 @@ Windows: steps: - uses: actions/checkout@v2 - - name: Build and run + - name: Build run: | export CC=clang-9 export CXX=clang++-9 @@ -77,6 +63,26 @@ Windows: - name: Run tests run: ./test/etl_tests + build-clang-9-linux-no-stl: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang-9 + export CXX=clang++-9 + cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + build-clang-10-osx: runs-on: ${{ matrix.os }} strategy: @@ -86,7 +92,7 @@ Windows: steps: - uses: actions/checkout@v2 - - name: Build and run + - name: Build run: | export CC=clang export CXX=clang++ @@ -97,3 +103,53 @@ Windows: - name: Run tests run: ./test/etl_tests + build-clang-10-osx-no-stl: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-10.15] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang + export CXX=clang++ + cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-windows-vs2019: + runs-on: [windows] + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: recursive + + - name: Installing vcpkg + run: | + cd .. + git clone https://github.com/Microsoft/vcpkg.git + cd vcpkg + git checkout --force 2020.01 + .\bootstrap-vcpkg.bat + .\vcpkg.exe install cppzmq:x64-windows + + - name: Build + run: | + cd ${{ github.workspace }} + mkdir build + cd build + cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }} + /../vcpkg/scripts/buildsystems/vcpkg.cmake + cd build + MSBuild.exe etl.sln /property:Configuration=Debug + + - name: Run tests + run: ./test/etl_tests From 9ce21707b4ad9612b9710c371d89b1096a73cbdc Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Sep 2020 11:31:21 +0100 Subject: [PATCH 058/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 586b0cd8..43fd3c13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,6 +8,7 @@ on: jobs: build-gcc-linux: + name: GCC Linux runs-on: ${{ matrix.os }} strategy: matrix: @@ -26,6 +27,7 @@ jobs: run: ./test/etl_tests build-gcc-linux-no-stl: + name: GCC Linux No STL runs-on: ${{ matrix.os }} strategy: matrix: @@ -44,6 +46,7 @@ jobs: run: ./test/etl_tests build-clang-9-linux: + name: Clang-9 Linux runs-on: ${{ matrix.os }} strategy: matrix: @@ -64,6 +67,7 @@ jobs: run: ./test/etl_tests build-clang-9-linux-no-stl: + name: Clang-9 Linux No STL runs-on: ${{ matrix.os }} strategy: matrix: @@ -84,6 +88,7 @@ jobs: run: ./test/etl_tests build-clang-10-osx: + name: Clang-10 OSX runs-on: ${{ matrix.os }} strategy: matrix: @@ -104,6 +109,7 @@ jobs: run: ./test/etl_tests build-clang-10-osx-no-stl: + name: Clang-10 OSX No STL runs-on: ${{ matrix.os }} strategy: matrix: @@ -124,6 +130,7 @@ jobs: run: ./test/etl_tests build-windows-vs2019: + name: Windows VS2019 Debug runs-on: [windows] steps: From 3819cf1bb7f062249c1550425a1c8e4639c9c5b7 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Sep 2020 18:56:15 +0100 Subject: [PATCH 059/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 43fd3c13..71ff7f50 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,6 @@ name: CI on: push: - branches: [ branches: [ feature/github-actions-for-windows-compilers ] pull_request: branches: [ master ] From cf4fe76427381232593e7e9ef1a497228d376aaf Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Sep 2020 19:18:05 +0100 Subject: [PATCH 060/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 123 +------------------------------------ 1 file changed, 1 insertion(+), 122 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 71ff7f50..e77c7d3e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,131 +6,10 @@ on: branches: [ master ] jobs: - build-gcc-linux: - name: GCC Linux - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04, ubuntu-20.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - cmake -DBUILD_TESTS=ON ./ - gcc --version - make - - - name: Run tests - run: ./test/etl_tests - - build-gcc-linux-no-stl: - name: GCC Linux No STL - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04, ubuntu-20.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ - gcc --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-9-linux: - name: Clang-9 Linux - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang-9 - export CXX=clang++-9 - cmake -D BUILD_TESTS=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-9-linux-no-stl: - name: Clang-9 Linux No STL - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang-9 - export CXX=clang++-9 - cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-10-osx: - name: Clang-10 OSX - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-10.15] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang - export CXX=clang++ - cmake -D BUILD_TESTS=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-10-osx-no-stl: - name: Clang-10 OSX No STL - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-10.15] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang - export CXX=clang++ - cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests build-windows-vs2019: name: Windows VS2019 Debug - runs-on: [windows] + runs-on: [windows-latest] steps: - name: Checkout From a4154b27dd4381b1e2a542498b43be7f521aca52 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Sep 2020 19:27:35 +0100 Subject: [PATCH 061/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e77c7d3e..d36eba67 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,6 @@ on: branches: [ master ] jobs: - build-windows-vs2019: name: Windows VS2019 Debug runs-on: [windows-latest] @@ -29,11 +28,6 @@ jobs: - name: Build run: | cd ${{ github.workspace }} - mkdir build - cd build - cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }} - /../vcpkg/scripts/buildsystems/vcpkg.cmake - cd build MSBuild.exe etl.sln /property:Configuration=Debug - name: Run tests From 78aa39ced507c275665b4ba05053b129c86339f6 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Sep 2020 19:43:27 +0100 Subject: [PATCH 062/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 137 +++++++++++++++++++++++++++++++++---- 1 file changed, 124 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d36eba67..e422af89 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,6 +6,128 @@ on: branches: [ master ] jobs: + build-gcc-linux: + name: GCC Linux + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + cmake -DBUILD_TESTS=ON ./ + gcc --version + make + + - name: Run tests + run: ./test/etl_tests + + build-gcc-linux-no-stl: + name: GCC Linux No STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ + gcc --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-9-linux: + name: Clang-9 Linux + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang-9 + export CXX=clang++-9 + cmake -D BUILD_TESTS=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-9-linux-no-stl: + name: Clang-9 Linux No STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang-9 + export CXX=clang++-9 + cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-10-osx: + name: Clang-10 OSX + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-10.15] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang + export CXX=clang++ + cmake -D BUILD_TESTS=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-10-osx-no-stl: + name: Clang-10 OSX No STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-10.15] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang + export CXX=clang++ + cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + build-windows-vs2019: name: Windows VS2019 Debug runs-on: [windows-latest] @@ -16,19 +138,8 @@ jobs: with: submodules: recursive - - name: Installing vcpkg - run: | - cd .. - git clone https://github.com/Microsoft/vcpkg.git - cd vcpkg - git checkout --force 2020.01 - .\bootstrap-vcpkg.bat - .\vcpkg.exe install cppzmq:x64-windows - - - name: Build - run: | - cd ${{ github.workspace }} - MSBuild.exe etl.sln /property:Configuration=Debug + - name: Build Binary + run: %programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" /p:Configuration=Debug /p:Platform=x86 - name: Run tests run: ./test/etl_tests From db74e54c870d64c581061554350b3a6d29f543f3 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Sep 2020 19:44:00 +0100 Subject: [PATCH 063/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 122 ------------------------------------- 1 file changed, 122 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e422af89..17b41950 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,128 +6,6 @@ on: branches: [ master ] jobs: - build-gcc-linux: - name: GCC Linux - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04, ubuntu-20.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - cmake -DBUILD_TESTS=ON ./ - gcc --version - make - - - name: Run tests - run: ./test/etl_tests - - build-gcc-linux-no-stl: - name: GCC Linux No STL - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04, ubuntu-20.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ - gcc --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-9-linux: - name: Clang-9 Linux - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang-9 - export CXX=clang++-9 - cmake -D BUILD_TESTS=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-9-linux-no-stl: - name: Clang-9 Linux No STL - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang-9 - export CXX=clang++-9 - cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-10-osx: - name: Clang-10 OSX - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-10.15] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang - export CXX=clang++ - cmake -D BUILD_TESTS=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-10-osx-no-stl: - name: Clang-10 OSX No STL - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-10.15] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang - export CXX=clang++ - cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - build-windows-vs2019: name: Windows VS2019 Debug runs-on: [windows-latest] From 1cd30b7e8ed6e7d5dd6872e305cd3e286cb7cd79 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Sep 2020 19:45:58 +0100 Subject: [PATCH 064/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17b41950..8bbbed00 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: submodules: recursive - name: Build Binary - run: %programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" /p:Configuration=Debug /p:Platform=x86 + run: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" /p:Configuration=Debug /p:Platform=x86 - name: Run tests run: ./test/etl_tests From fa3926bacf423407e4024461d24da739d28af3d9 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Sep 2020 19:47:26 +0100 Subject: [PATCH 065/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8bbbed00..af013272 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: submodules: recursive - name: Build Binary - run: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" /p:Configuration=Debug /p:Platform=x86 + run: "C:\Program Files (x86)\Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/msbuild.exe" /p:Configuration=Debug /p:Platform=x86 - name: Run tests run: ./test/etl_tests From 3f37897a4868d46b0f5469482bd5212967367184 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Sep 2020 19:48:07 +0100 Subject: [PATCH 066/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index af013272..60946008 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: submodules: recursive - name: Build Binary - run: "C:\Program Files (x86)\Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/msbuild.exe" /p:Configuration=Debug /p:Platform=x86 + run: "C:\Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/msbuild.exe" /p:Configuration=Debug /p:Platform=x86 - name: Run tests run: ./test/etl_tests From 1d993142542b20c85de8528c5a6e2fe6f84dd25c Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Sep 2020 19:50:10 +0100 Subject: [PATCH 067/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 60946008..90f1781b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: with: submodules: recursive - - name: Build Binary + - name: Build run: "C:\Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/msbuild.exe" /p:Configuration=Debug /p:Platform=x86 - name: Run tests From 6a1a2d56e576690ec5d439e6a5eb8f4f2292f69a Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Sep 2020 19:57:14 +0100 Subject: [PATCH 068/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 125 ++++++++++++++++++++++++++++++++++--- 1 file changed, 116 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 90f1781b..bd682e29 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,23 +1,130 @@ name: CI on: push: - branches: [ feature/github-actions-for-windows-compilers ] + branches: [ master ] pull_request: branches: [ master ] jobs: - build-windows-vs2019: - name: Windows VS2019 Debug - runs-on: [windows-latest] + build-gcc-linux: + name: GCC Linux + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] steps: - - name: Checkout - uses: actions/checkout@v2 - with: - submodules: recursive + - uses: actions/checkout@v2 - name: Build - run: "C:\Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/msbuild.exe" /p:Configuration=Debug /p:Platform=x86 + run: | + cmake -DBUILD_TESTS=ON ./ + gcc --version + make + + - name: Run tests + run: ./test/etl_tests + + build-gcc-linux-no-stl: + name: GCC Linux No STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ + gcc --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-9-linux: + name: Clang-9 Linux + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang-9 + export CXX=clang++-9 + cmake -D BUILD_TESTS=ON ./ + clang --version + make - name: Run tests run: ./test/etl_tests + + build-clang-9-linux-no-stl: + name: Clang-9 Linux No STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang-9 + export CXX=clang++-9 + cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-10-osx: + name: Clang-10 OSX + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-10.15] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang + export CXX=clang++ + cmake -D BUILD_TESTS=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-10-osx-no-stl: + name: Clang-10 OSX No STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-10.15] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang + export CXX=clang++ + cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + From 2bedbdf699e9d3bf990c3066425a88146c01cda3 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 09:57:20 +0100 Subject: [PATCH 069/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bd682e29..08bb70fc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -128,3 +128,18 @@ jobs: - name: Run tests run: ./test/etl_tests + build-windows-vs2019: + name: Windows VS2019 Debug + runs-on: [windows-latest] + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: recursive + + - name: Build + run: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" test/vs2019/etl.sln /p:Configuration=Debug /p:Platform=x86 + + - name: Run tests + run: ./test/etl_tests From a08366166648d9411424493c89e06a55f844acb8 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 09:57:29 +0100 Subject: [PATCH 070/130] Add VS2019 configuration to Github CI --- .github/workflows/main-last.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/main-last.yml diff --git a/.github/workflows/main-last.yml b/.github/workflows/main-last.yml new file mode 100644 index 00000000..2e8e1b56 --- /dev/null +++ b/.github/workflows/main-last.yml @@ -0,0 +1,23 @@ +name: CI +on: + push: + branches: [ feature/github-actions-for-windows-compilers ] + pull_request: + branches: [ master ] + +jobs: + build-windows-vs2019: + name: Windows VS2019 Debug + runs-on: [windows-latest] + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: recursive + + - name: Build + run: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" test/vs2019/etl.sln /p:Configuration=Debug /p:Platform=x86 + + - name: Run tests + run: ./test/etl_tests From 0b23e71578d402d49e3f31259dcd3d17b0ca6ac9 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 10:05:20 +0100 Subject: [PATCH 071/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 126 +------------------------------------ 1 file changed, 2 insertions(+), 124 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08bb70fc..b6f51d93 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,133 +1,11 @@ name: CI on: push: - branches: [ master ] + branches: [ feature/github-actions-for-windows-compilers ] pull_request: branches: [ master ] jobs: - build-gcc-linux: - name: GCC Linux - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04, ubuntu-20.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - cmake -DBUILD_TESTS=ON ./ - gcc --version - make - - - name: Run tests - run: ./test/etl_tests - - build-gcc-linux-no-stl: - name: GCC Linux No STL - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04, ubuntu-20.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ - gcc --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-9-linux: - name: Clang-9 Linux - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang-9 - export CXX=clang++-9 - cmake -D BUILD_TESTS=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-9-linux-no-stl: - name: Clang-9 Linux No STL - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang-9 - export CXX=clang++-9 - cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-10-osx: - name: Clang-10 OSX - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-10.15] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang - export CXX=clang++ - cmake -D BUILD_TESTS=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-10-osx-no-stl: - name: Clang-10 OSX No STL - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-10.15] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang - export CXX=clang++ - cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - build-windows-vs2019: name: Windows VS2019 Debug runs-on: [windows-latest] @@ -139,7 +17,7 @@ jobs: submodules: recursive - name: Build - run: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" test/vs2019/etl.sln /p:Configuration=Debug /p:Platform=x86 + run: "C:/Program Files (x86)\Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe" test/vs2019/etl.sln /p:Configuration=Debug /p:Platform=x86 - name: Run tests run: ./test/etl_tests From 698094c422b9f76697641e20782b82ab2d3d7891 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 10:11:07 +0100 Subject: [PATCH 072/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b6f51d93..525f47bd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: submodules: recursive - name: Build - run: "C:/Program Files (x86)\Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe" test/vs2019/etl.sln /p:Configuration=Debug /p:Platform=x86 + run: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe" test/vs2019/etl.sln /p:Configuration=Debug /p:Platform=x86 - name: Run tests run: ./test/etl_tests From 2654f52cdd3b497e277d3ccf2ac7e242e899a7be Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 10:12:33 +0100 Subject: [PATCH 073/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 525f47bd..8dd02c9e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: submodules: recursive - name: Build - run: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe" test/vs2019/etl.sln /p:Configuration=Debug /p:Platform=x86 + run: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe test/vs2019/etl.sln /p:Configuration=Debug /p:Platform=x86" - name: Run tests run: ./test/etl_tests From 646f95505ae4159a9f59edf9f42a8a67e4849a13 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 10:16:52 +0100 Subject: [PATCH 074/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8dd02c9e..6919ab6d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,8 +16,11 @@ jobs: with: submodules: recursive + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.0.1 + - name: Build - run: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe test/vs2019/etl.sln /p:Configuration=Debug /p:Platform=x86" + run: MSBuild.exe test/vs2019/etl.sln /p:Configuration=Debug /p:Platform=x86 - name: Run tests run: ./test/etl_tests From 6cb4d8829d96863e4992efb3cf4fa03acb31ec11 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 10:18:59 +0100 Subject: [PATCH 075/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6919ab6d..da4327f7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: uses: microsoft/setup-msbuild@v1.0.1 - name: Build - run: MSBuild.exe test/vs2019/etl.sln /p:Configuration=Debug /p:Platform=x86 + run: MSBuild.exe test/vs2019/etl.sln /p:Configuration=debug /p:Platform=x86 - name: Run tests run: ./test/etl_tests From 8e67b682452640fa7f6dbe968de06b4813b02bd8 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 10:23:24 +0100 Subject: [PATCH 076/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index da4327f7..1ec73316 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: uses: microsoft/setup-msbuild@v1.0.1 - name: Build - run: MSBuild.exe test/vs2019/etl.sln /p:Configuration=debug /p:Platform=x86 + run: MSBuild.exe test/vs2019/etl.sln /p:Configuration=Debug - name: Run tests run: ./test/etl_tests From be2a660a62a485148d4d1a2b2dcdb12edc58860f Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 10:25:25 +0100 Subject: [PATCH 077/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1ec73316..ed2b3f48 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: uses: microsoft/setup-msbuild@v1.0.1 - name: Build - run: MSBuild.exe test/vs2019/etl.sln /p:Configuration=Debug + run: MSBuild.exe test/vs2019/etl.sln - name: Run tests run: ./test/etl_tests From bc993027bf80fb23924d33ffddef92f2004e2a2d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 10:36:45 +0100 Subject: [PATCH 078/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ed2b3f48..2f30164d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,6 +19,12 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.0.1 + - name: Checkout UnitTest++ + uses: actions/checkout@v2 + with: + repository: unittest-cpp/unittest-cpp + path: unittest-cpp + - name: Build run: MSBuild.exe test/vs2019/etl.sln From 7dc4d0ad941896eb5f2ca85758c0351673634c6d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 10:41:32 +0100 Subject: [PATCH 079/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2f30164d..5b59d897 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v2 with: repository: unittest-cpp/unittest-cpp - path: unittest-cpp + path: /unittest-cpp - name: Build run: MSBuild.exe test/vs2019/etl.sln From 5fdf89db4827f6fff74b8883aa0671a5aeb4a503 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 10:43:31 +0100 Subject: [PATCH 080/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b59d897..2afd8b0b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v2 with: repository: unittest-cpp/unittest-cpp - path: /unittest-cpp + path: ../../../unittest-cpp - name: Build run: MSBuild.exe test/vs2019/etl.sln From be8679bb571db37062d166e04e79f16231820025 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 11:32:19 +0100 Subject: [PATCH 081/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2afd8b0b..aff3b501 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v2 with: repository: unittest-cpp/unittest-cpp - path: ../../../unittest-cpp + path: ${GITHUB_WORKSPACE}/unittest-cpp - name: Build run: MSBuild.exe test/vs2019/etl.sln From c21cbbd8a94cec1672b1ff09c94b4716ac86c74c Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 11:39:40 +0100 Subject: [PATCH 082/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aff3b501..366a90c5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v2 with: repository: unittest-cpp/unittest-cpp - path: ${GITHUB_WORKSPACE}/unittest-cpp + path: ${GITHUB_WORKSPACE}../../unittest-cpp - name: Build run: MSBuild.exe test/vs2019/etl.sln From bb9b00c8c9c1a99a404f3a512764602881e3ab57 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 11:55:11 +0100 Subject: [PATCH 083/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 125 ++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 366a90c5..a38d48b9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,6 +6,7 @@ on: branches: [ master ] jobs: + build-windows-vs2019: name: Windows VS2019 Debug runs-on: [windows-latest] @@ -23,10 +24,132 @@ jobs: uses: actions/checkout@v2 with: repository: unittest-cpp/unittest-cpp - path: ${GITHUB_WORKSPACE}../../unittest-cpp + path: ${GITHUB_WORKSPACE}../unittest-cpp - name: Build run: MSBuild.exe test/vs2019/etl.sln - name: Run tests run: ./test/etl_tests + + build-gcc-linux: + name: GCC Linux + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + cmake -DBUILD_TESTS=ON ./ + gcc --version + make + + - name: Run tests + run: ./test/etl_tests + + build-gcc-linux-no-stl: + name: GCC Linux No STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ + gcc --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-9-linux: + name: Clang-9 Linux + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang-9 + export CXX=clang++-9 + cmake -D BUILD_TESTS=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-9-linux-no-stl: + name: Clang-9 Linux No STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang-9 + export CXX=clang++-9 + cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-10-osx: + name: Clang-10 OSX + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-10.15] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang + export CXX=clang++ + cmake -D BUILD_TESTS=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-10-osx-no-stl: + name: Clang-10 OSX No STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-10.15] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang + export CXX=clang++ + cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests From 17f2f66932440dc703ea206e348fb7787cf08265 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 11:56:18 +0100 Subject: [PATCH 084/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 121 ------------------------------------- 1 file changed, 121 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a38d48b9..c013c704 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,124 +32,3 @@ jobs: - name: Run tests run: ./test/etl_tests - build-gcc-linux: - name: GCC Linux - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04, ubuntu-20.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - cmake -DBUILD_TESTS=ON ./ - gcc --version - make - - - name: Run tests - run: ./test/etl_tests - - build-gcc-linux-no-stl: - name: GCC Linux No STL - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04, ubuntu-20.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ - gcc --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-9-linux: - name: Clang-9 Linux - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang-9 - export CXX=clang++-9 - cmake -D BUILD_TESTS=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-9-linux-no-stl: - name: Clang-9 Linux No STL - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang-9 - export CXX=clang++-9 - cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-10-osx: - name: Clang-10 OSX - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-10.15] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang - export CXX=clang++ - cmake -D BUILD_TESTS=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests - - build-clang-10-osx-no-stl: - name: Clang-10 OSX No STL - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-10.15] - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - export CC=clang - export CXX=clang++ - cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ - clang --version - make - - - name: Run tests - run: ./test/etl_tests From 45573dbd85d65cd5ce1e2907e010902c78e30d05 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 11:57:52 +0100 Subject: [PATCH 085/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c013c704..34cf8dd3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v2 with: repository: unittest-cpp/unittest-cpp - path: ${GITHUB_WORKSPACE}../unittest-cpp + path: ${GITHUB_WORKSPACE}/../unittest-cpp - name: Build run: MSBuild.exe test/vs2019/etl.sln From 2a4756d6422eabfbcb1d0416b9352d9eb9bfbcbb Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 11:59:29 +0100 Subject: [PATCH 086/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 34cf8dd3..28d95a4a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v2 with: repository: unittest-cpp/unittest-cpp - path: ${GITHUB_WORKSPACE}/../unittest-cpp + path: ${GITHUB_WORKSPACE}/../../../unittest-cpp - name: Build run: MSBuild.exe test/vs2019/etl.sln From 362e5131f817273cfa2d688ec2d68a45fecb6775 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 16:49:22 +0100 Subject: [PATCH 087/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 28d95a4a..cce0a11f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,10 +21,13 @@ jobs: uses: microsoft/setup-msbuild@v1.0.1 - name: Checkout UnitTest++ + run: | + echo ${GITHUB_WORKSPACE} + echo ::set-env name=workspace::$GITHUB_WORKSPACE uses: actions/checkout@v2 with: repository: unittest-cpp/unittest-cpp - path: ${GITHUB_WORKSPACE}/../../../unittest-cpp + path: ${{ env.workspace }}/../../../unittest-cpp - name: Build run: MSBuild.exe test/vs2019/etl.sln From 373c90c5532759a1fd81c8f5b8ff6e9b71157557 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 16:50:37 +0100 Subject: [PATCH 088/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cce0a11f..ad3603c0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,10 +20,12 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.0.1 - - name: Checkout UnitTest++ + - name: Directories run: | echo ${GITHUB_WORKSPACE} echo ::set-env name=workspace::$GITHUB_WORKSPACE + + - name: Checkout UnitTest++ uses: actions/checkout@v2 with: repository: unittest-cpp/unittest-cpp From 048c367ad072ab2a9f88324cff176813d6f68b83 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 16:53:21 +0100 Subject: [PATCH 089/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ad3603c0..8a784114 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,14 +22,14 @@ jobs: - name: Directories run: | - echo ${GITHUB_WORKSPACE} echo ::set-env name=workspace::$GITHUB_WORKSPACE + echo ${{ github.workspace }} - name: Checkout UnitTest++ uses: actions/checkout@v2 with: repository: unittest-cpp/unittest-cpp - path: ${{ env.workspace }}/../../../unittest-cpp + path: ${{ github.workspace }}/unittest-cpp - name: Build run: MSBuild.exe test/vs2019/etl.sln From e3f4d3536c853aa154c2f01e211f1adfa35d61d7 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 16:57:13 +0100 Subject: [PATCH 090/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8a784114..2ddd4cda 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,12 +24,13 @@ jobs: run: | echo ::set-env name=workspace::$GITHUB_WORKSPACE echo ${{ github.workspace }} + echo ${{ github.workspace }}../unittest-cpp - name: Checkout UnitTest++ uses: actions/checkout@v2 with: repository: unittest-cpp/unittest-cpp - path: ${{ github.workspace }}/unittest-cpp + path: ${{ github.workspace }}../unittest-cpp - name: Build run: MSBuild.exe test/vs2019/etl.sln From af226c09a09b7de850f4b0c0bec90ab4677dee49 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:00:19 +0100 Subject: [PATCH 091/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ddd4cda..b2d4b448 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,13 +24,13 @@ jobs: run: | echo ::set-env name=workspace::$GITHUB_WORKSPACE echo ${{ github.workspace }} - echo ${{ github.workspace }}../unittest-cpp + echo ${{ github.workspace }}/../unittest-cpp - name: Checkout UnitTest++ uses: actions/checkout@v2 with: repository: unittest-cpp/unittest-cpp - path: ${{ github.workspace }}../unittest-cpp + path: ${{ github.workspace }}/../unittest-cpp - name: Build run: MSBuild.exe test/vs2019/etl.sln From 8dc0db48f214a9a0bb6891a4abfdc1f47ed8a19f Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:01:59 +0100 Subject: [PATCH 092/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b2d4b448..af2fad80 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,6 +25,8 @@ jobs: echo ::set-env name=workspace::$GITHUB_WORKSPACE echo ${{ github.workspace }} echo ${{ github.workspace }}/../unittest-cpp + pwd + - name: Checkout UnitTest++ uses: actions/checkout@v2 From 19fbfe774fd1761eb4a3e833697d3d13ed7c8c71 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:04:02 +0100 Subject: [PATCH 093/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index af2fad80..9b205da4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,9 @@ jobs: echo ${{ github.workspace }} echo ${{ github.workspace }}/../unittest-cpp pwd - + ls + cd test + ls - name: Checkout UnitTest++ uses: actions/checkout@v2 From 2a677f99aa99993264b471834ce705cc4e4ef3e5 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:06:40 +0100 Subject: [PATCH 094/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9b205da4..6f4bbb9c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,19 +26,19 @@ jobs: echo ${{ github.workspace }} echo ${{ github.workspace }}/../unittest-cpp pwd - ls + dir cd test - ls + dir - - name: Checkout UnitTest++ - uses: actions/checkout@v2 - with: - repository: unittest-cpp/unittest-cpp - path: ${{ github.workspace }}/../unittest-cpp +# - name: Checkout UnitTest++ +# uses: actions/checkout@v2 +# with: +# repository: unittest-cpp/unittest-cpp +# path: ${{ github.workspace }}/../unittest-cpp +# +# - name: Build +# run: MSBuild.exe test/vs2019/etl.sln - - name: Build - run: MSBuild.exe test/vs2019/etl.sln - - - name: Run tests - run: ./test/etl_tests +# - name: Run tests +# run: ./test/etl_tests From 811cbcfedf881a42af7f754a3b1256c3661f1636 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:13:13 +0100 Subject: [PATCH 095/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 43 ++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6f4bbb9c..85083d47 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,24 +11,35 @@ jobs: name: Windows VS2019 Debug runs-on: [windows-latest] - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - submodules: recursive + steps: + - uses: actions/checkout@v2 - - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.0.1 - - - name: Directories + - name: Build and run run: | - echo ::set-env name=workspace::$GITHUB_WORKSPACE - echo ${{ github.workspace }} - echo ${{ github.workspace }}/../unittest-cpp - pwd - dir - cd test - dir + cmake.exe --help +# export CC=msvc +# export CXX=msvc +# cmake -D BUILD_TESTS=ON ./ +# make + +# - name: Run tests +# run: ./test/etl_tests + +# steps: +# - name: Checkout +# uses: actions/checkout@v2 +# with: +# submodules: recursive + +# - name: Add msbuild to PATH +# uses: microsoft/setup-msbuild@v1.0.1 + +# - name: Directories +# run: | +# echo ::set-env name=workspace::$GITHUB_WORKSPACE +# echo ${{ github.workspace }} +# echo ${{ github.workspace }}/../unittest-cpp + # - name: Checkout UnitTest++ # uses: actions/checkout@v2 From 845d6902f119d978308408200edeec2b2dc3f9f3 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:15:34 +0100 Subject: [PATCH 096/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 85083d47..9adf4ea9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,6 @@ jobs: runs-on: [windows-latest] steps: - - uses: actions/checkout@v2 - name: Build and run run: | From 331513c3e09008976e1d86ccdb0a18301a4ed96c Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:19:46 +0100 Subject: [PATCH 097/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9adf4ea9..9f29cd3e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,16 +6,13 @@ on: branches: [ master ] jobs: - build-windows-vs2019: name: Windows VS2019 Debug runs-on: [windows-latest] steps: - - - name: Build and run - run: | - cmake.exe --help + - name: Build and run + run: cmake.exe --help # export CC=msvc # export CXX=msvc # cmake -D BUILD_TESTS=ON ./ From 3bddc4ff1cfbf96a12fea4ff470964710f687673 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:21:36 +0100 Subject: [PATCH 098/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9f29cd3e..d05831a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,6 +13,7 @@ jobs: steps: - name: Build and run run: cmake.exe --help + # export CC=msvc # export CXX=msvc # cmake -D BUILD_TESTS=ON ./ From a36b45cdb375a61c17b5c9218ecd1b71689033a7 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:22:58 +0100 Subject: [PATCH 099/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d05831a6..7de6330d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: runs-on: [windows-latest] steps: - - name: Build and run + - name: Build and run run: cmake.exe --help # export CC=msvc From a5b6dc79609c088fe5db4d31caf2480198586fdb Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:26:48 +0100 Subject: [PATCH 100/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7de6330d..0ae5eb5a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: name: Windows VS2019 Debug runs-on: [windows-latest] - steps: + steps: - name: Build and run run: cmake.exe --help From 78c5a82ffc10a1e20b7a89d3276e077b3b0654c7 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:32:06 +0100 Subject: [PATCH 101/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0ae5eb5a..755b7754 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,9 +14,7 @@ jobs: - name: Build and run run: cmake.exe --help -# export CC=msvc -# export CXX=msvc -# cmake -D BUILD_TESTS=ON ./ + cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ # make # - name: Run tests From 56caea01bdf6b2ec3cd52c53b2e50d884ac563b4 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:37:05 +0100 Subject: [PATCH 102/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 755b7754..b9172e4f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,9 +12,9 @@ jobs: steps: - name: Build and run - run: cmake.exe --help - - cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ + run: | + cmake.exe --help + cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ # make # - name: Run tests From 29aa68326e6c354b978193044d71b6b68aca92fa Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:41:41 +0100 Subject: [PATCH 103/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b9172e4f..793de4bb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,6 +11,11 @@ jobs: runs-on: [windows-latest] steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: recursive + - name: Build and run run: | cmake.exe --help @@ -21,10 +26,7 @@ jobs: # run: ./test/etl_tests # steps: -# - name: Checkout -# uses: actions/checkout@v2 -# with: -# submodules: recursive + # - name: Add msbuild to PATH # uses: microsoft/setup-msbuild@v1.0.1 From 9f2bfa17a6604bfecfcdd7fa1f418a2f474f07b7 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:44:29 +0100 Subject: [PATCH 104/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 793de4bb..69f6632a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,9 +18,8 @@ jobs: - name: Build and run run: | - cmake.exe --help cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ -# make + make # - name: Run tests # run: ./test/etl_tests From e35417871887a6fe9aeaaa59b01c27e4dfe12ef1 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:51:31 +0100 Subject: [PATCH 105/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 27 -------------------------- CMakeLists.txt | 39 -------------------------------------- 2 files changed, 66 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69f6632a..388850a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,31 +21,4 @@ jobs: cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ make -# - name: Run tests -# run: ./test/etl_tests - -# steps: - - -# - name: Add msbuild to PATH -# uses: microsoft/setup-msbuild@v1.0.1 - -# - name: Directories -# run: | -# echo ::set-env name=workspace::$GITHUB_WORKSPACE -# echo ${{ github.workspace }} -# echo ${{ github.workspace }}/../unittest-cpp - - -# - name: Checkout UnitTest++ -# uses: actions/checkout@v2 -# with: -# repository: unittest-cpp/unittest-cpp -# path: ${{ github.workspace }}/../unittest-cpp -# -# - name: Build -# run: MSBuild.exe test/vs2019/etl.sln - -# - name: Run tests -# run: ./test/etl_tests diff --git a/CMakeLists.txt b/CMakeLists.txt index 72627167..05f8721a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,15 +4,6 @@ cmake_minimum_required(VERSION 3.5.0) project(etl) -####################################################################### -# Define an option to allow consumers of the library to -# specify the profile they would like to compile to. If -# not explicitly set CMake will attempt to choose an appropriate -# profile based on the compiler -####################################################################### -set(ETL_PROFILE "DEFAULT" CACHE STRING "Defines what profile header to include. See https://www.etlcpp.com/setup.html" -) - option(BUILD_TESTS "Build unit tests" OFF) add_library(etl INTERFACE) @@ -20,42 +11,12 @@ add_library(etl INTERFACE) target_include_directories(etl INTERFACE include - include/etl/profiles ) -if (${ETL_PROFILE} STREQUAL DEFAULT) - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") - set(ETL_PROFILE "PROFILE_GCC_GENERIC") - - elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(ETL_PROFILE "PROFILE_CLANG_GENERIC") - - elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - set(ETL_PROFILE "PROFILE_MSVC") - - elseif (CMAKE_CXX_COMPILER_ID MATCHES "ARMCC") - if (CXX_STANDARD EQUAL 11) - set(ETL_PROFILE "PROFILE_ARMV6") - else () - set(ETL_PROFILE "PROFILE_ARMV5") - endif() - elseif (CMAKE_CXX_COMPILER_ID MATCHES "TI") - set(ETL_PROFILE "PROFILE_TICC") - - else() - message(FATAL_ERROR "Can't generate default profile for compiler: ${CMAKE_CXX_COMPILER_ID}") - endif() -endif() - -message(STATUS "Compiling with ETL profile set to: ${ETL_PROFILE}") - target_compile_definitions(etl INTERFACE - ${ETL_PROFILE} ) - - if (BUILD_TESTS) enable_testing() add_subdirectory(test) From 24d7f467b84008da974f462c354913b9dc622d48 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 17:55:27 +0100 Subject: [PATCH 106/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 388850a3..edcd66a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,6 +19,7 @@ jobs: - name: Build and run run: | cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ - make + ls + make -f makefile.txt From ded6aed47387230296101569efb833240167c902 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 18:02:57 +0100 Subject: [PATCH 107/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index edcd66a4..8811a9d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,6 +19,7 @@ jobs: - name: Build and run run: | cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ + cd test ls make -f makefile.txt From 37c562538796cac192dc30e7d16839d7cc07711d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 18:07:40 +0100 Subject: [PATCH 108/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8811a9d9..20597cdd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,11 +16,11 @@ jobs: with: submodules: recursive + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.0.1 + - name: Build and run run: | cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ - cd test - ls - make -f makefile.txt - + nmake From 2f7d60d9975a81feb2e0f2e7fa71946015e34ac0 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 18:17:16 +0100 Subject: [PATCH 109/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 20597cdd..0dd65984 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,5 +22,6 @@ jobs: - name: Build and run run: | cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ - nmake + ls + #MSBuild.exe test/.sln From eb1dd7e473ae25044d5642457424eca82b214aee Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 18:19:45 +0100 Subject: [PATCH 110/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0dd65984..0bad767d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,6 +22,5 @@ jobs: - name: Build and run run: | cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ - ls - #MSBuild.exe test/.sln + MSBuild.exe etl.sln From 5d15f8fb44be7ae37a1166aca12f27ea8dbbcef8 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 18:27:00 +0100 Subject: [PATCH 111/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0bad767d..6993152c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,4 +23,4 @@ jobs: run: | cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ MSBuild.exe etl.sln - + run: ./test/etl_tests From 290f34535b639edc364821308f3d8388be85bb10 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 19:30:46 +0100 Subject: [PATCH 112/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6993152c..f9227198 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,8 +19,10 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.0.1 - - name: Build and run + - name: Build run: | cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ MSBuild.exe etl.sln - run: ./test/etl_tests + + -name: Run tests + run: ./test/etl_tests From c87fe057b3e374f8a3936b068d46ee6d6def002f Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 19:36:28 +0100 Subject: [PATCH 113/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f9227198..8fba93d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,5 +24,5 @@ jobs: cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ MSBuild.exe etl.sln - -name: Run tests - run: ./test/etl_tests + - name: Run tests + run: ./test/etl_tests From 38d3cd35953c8d6e7057ecda431a68ee705a6587 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 1 Oct 2020 19:42:57 +0100 Subject: [PATCH 114/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8fba93d3..d3a0add9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,4 +25,4 @@ jobs: MSBuild.exe etl.sln - name: Run tests - run: ./test/etl_tests + run: ./test/etl_tests.exe From 31e84421d86ad709651dd449d23910272a0b49db Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 09:40:02 +0100 Subject: [PATCH 115/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d3a0add9..09b3390f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,4 +25,4 @@ jobs: MSBuild.exe etl.sln - name: Run tests - run: ./test/etl_tests.exe + run: ./etl_tests.exe From f4148c647b890cf53501f1923d5a4605372e66ee Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 09:49:55 +0100 Subject: [PATCH 116/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 09b3390f..3836eb01 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,4 +25,6 @@ jobs: MSBuild.exe etl.sln - name: Run tests - run: ./etl_tests.exe + run: | + ls *.exe + ./etl_tests.exe From 0f8b95c7b4fd81dc626f5436c7e6aa04612d4519 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 09:56:34 +0100 Subject: [PATCH 117/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3836eb01..a007f522 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,4 +27,4 @@ jobs: - name: Run tests run: | ls *.exe - ./etl_tests.exe + etl_tests.exe From e0edc9824d91763c29907ac555cfeffc5ab3fd62 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 10:29:41 +0100 Subject: [PATCH 118/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a007f522..09a6018f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,5 +26,5 @@ jobs: - name: Run tests run: | - ls *.exe + ls etl_tests.exe From ce9526dcb915463f280c238f3c0e2ce3c48c4a4d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 10:51:23 +0100 Subject: [PATCH 119/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 09a6018f..d8075f5d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,5 +26,6 @@ jobs: - name: Run tests run: | + cd test ls etl_tests.exe From 4b2662d33c47cb04793e1141778ba09230e26378 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 11:02:15 +0100 Subject: [PATCH 120/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d8075f5d..b36bd458 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,5 +27,6 @@ jobs: - name: Run tests run: | cd test + cd debug ls etl_tests.exe From 00d27fce28fd209550aa89e6a058959521abf341 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 11:09:37 +0100 Subject: [PATCH 121/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b36bd458..e5923fe2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,4 +29,4 @@ jobs: cd test cd debug ls - etl_tests.exe + ./etl_tests.exe From fbb7e467833e57054beb03e98bf8981eb9c81d5d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 11:35:17 +0100 Subject: [PATCH 122/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e5923fe2..6ba6be86 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,8 +25,4 @@ jobs: MSBuild.exe etl.sln - name: Run tests - run: | - cd test - cd debug - ls - ./etl_tests.exe + run: ./test/debug/etl_tests.exe From 534d5965076aced7b72c4301fd01f00df1825683 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 12:05:51 +0100 Subject: [PATCH 123/130] Add VS2019 configuration to Github CI --- test/test_indirect_vector.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/test_indirect_vector.cpp b/test/test_indirect_vector.cpp index 24bbb0f7..cfbaf30d 100644 --- a/test/test_indirect_vector.cpp +++ b/test/test_indirect_vector.cpp @@ -804,14 +804,16 @@ namespace std::vector compare_data; etl::indirect_vector data; + const char* p = (const char* )0x12345678; + std::string s; for (size_t i = 0; i < SIZE; ++i) { s += "x"; // 4 arguments - compare_data.emplace_back(s, i, static_cast(i) + 0.1234, "emplace_back"); - data.emplace_back(s, i, static_cast(i) + 0.1234, "emplace_back"); + compare_data.emplace_back(s, i, static_cast(i) + 0.1234, p); + data.emplace_back(s, i, static_cast(i) + 0.1234, p); // 3 arguments compare_data.emplace_back(s, i, static_cast(i) + 0.1234); From 70031f2d30cb8935e879340a047fa6ce4751b89d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 17:24:42 +0100 Subject: [PATCH 124/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ba6be86..2c97f5cd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,8 +6,29 @@ on: branches: [ master ] jobs: - build-windows-vs2019: - name: Windows VS2019 Debug +# build-windows-vs2019: +# name: Windows VS2019 Debug +# runs-on: [windows-latest] + +# steps: +# - name: Checkout +# uses: actions/checkout@v2 +# with: +# submodules: recursive + +# - name: Add msbuild to PATH +# uses: microsoft/setup-msbuild@v1.0.1 + +# - name: Build +# run: | +# cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ +# MSBuild.exe etl.sln + +# - name: Run tests +# run: ./test/debug/etl_tests.exe + + build-windows-vs2019-no-stl: + name: Windows VS2019 Debug - No STL runs-on: [windows-latest] steps: @@ -21,7 +42,7 @@ jobs: - name: Build run: | - cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ + cmake -G "Visual Studio 16 2019" -D NO_STL -D BUILD_TESTS=ON ./ MSBuild.exe etl.sln - name: Run tests From 2df9504d74a6838a7294320c251f48501bcc9551 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 17:27:20 +0100 Subject: [PATCH 125/130] Add VS2019 configuration to Github CI --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2c97f5cd..92737601 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ jobs: # - name: Build # run: | -# cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ +# cmake -G "Visual Studio 16 2019" -DBUILD_TESTS=ON ./ # MSBuild.exe etl.sln # - name: Run tests @@ -42,7 +42,7 @@ jobs: - name: Build run: | - cmake -G "Visual Studio 16 2019" -D NO_STL -D BUILD_TESTS=ON ./ + cmake -G "Visual Studio 16 2019" -DBUILD_TESTS=ON -DNO_STL=ON ./ MSBuild.exe etl.sln - name: Run tests From caabbba35746d7278bde9385c02de424a3bdb6e3 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 17:41:01 +0100 Subject: [PATCH 126/130] Add VS2019 configuration to Github CI --- .github/workflows/clang.yml | 91 ++++++++++++++++++++++ .github/workflows/gcc.yml | 45 +++++++++++ .github/workflows/{main.yml => vs2019.yml} | 32 ++++---- 3 files changed, 152 insertions(+), 16 deletions(-) create mode 100644 .github/workflows/clang.yml create mode 100644 .github/workflows/gcc.yml rename .github/workflows/{main.yml => vs2019.yml} (57%) diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml new file mode 100644 index 00000000..732b73fe --- /dev/null +++ b/.github/workflows/clang.yml @@ -0,0 +1,91 @@ +name: CI +on: + push: + branches: [ feature/github-actions-for-windows-compilers ] + pull_request: + branches: [ master ] + +jobs: + build-clang-9-linux: + name: Clang-9 Linux + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang-9 + export CXX=clang++-9 + cmake -D BUILD_TESTS=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-9-linux-no-stl: + name: Clang-9 Linux No STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang-9 + export CXX=clang++-9 + cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-10-osx: + name: Clang-10 OSX + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-10.15] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang + export CXX=clang++ + cmake -D BUILD_TESTS=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests + + build-clang-10-osx-no-stl: + name: Clang-10 OSX No STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-10.15] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + export CC=clang + export CXX=clang++ + cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ + clang --version + make + + - name: Run tests + run: ./test/etl_tests diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml new file mode 100644 index 00000000..6c09d11f --- /dev/null +++ b/.github/workflows/gcc.yml @@ -0,0 +1,45 @@ +name: CI +on: + push: + branches: [ feature/github-actions-for-windows-compilers ] + pull_request: + branches: [ master ] + +jobs: + build-gcc-linux: + name: GCC Linux + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + cmake -DBUILD_TESTS=ON ./ + gcc --version + make + + - name: Run tests + run: ./test/etl_tests + + build-gcc-linux-no-stl: + name: GCC Linux - No STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ + gcc --version + make + + - name: Run tests + run: ./test/etl_tests diff --git a/.github/workflows/main.yml b/.github/workflows/vs2019.yml similarity index 57% rename from .github/workflows/main.yml rename to .github/workflows/vs2019.yml index 92737601..f1468e9a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/vs2019.yml @@ -6,26 +6,26 @@ on: branches: [ master ] jobs: -# build-windows-vs2019: -# name: Windows VS2019 Debug -# runs-on: [windows-latest] + build-windows-vs2019: + name: Windows VS2019 Debug + runs-on: [windows-latest] -# steps: -# - name: Checkout -# uses: actions/checkout@v2 -# with: -# submodules: recursive + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: recursive -# - name: Add msbuild to PATH -# uses: microsoft/setup-msbuild@v1.0.1 + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.0.1 -# - name: Build -# run: | -# cmake -G "Visual Studio 16 2019" -DBUILD_TESTS=ON ./ -# MSBuild.exe etl.sln + - name: Build + run: | + cmake -G "Visual Studio 16 2019" -DBUILD_TESTS=ON ./ + MSBuild.exe etl.sln -# - name: Run tests -# run: ./test/debug/etl_tests.exe + - name: Run tests + run: ./test/debug/etl_tests.exe build-windows-vs2019-no-stl: name: Windows VS2019 Debug - No STL From 2f1635f894cb82577603740eeb709979460b1cb7 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 17:41:55 +0100 Subject: [PATCH 127/130] Add VS2019 configuration to Github CI --- .github/workflows/main-last.yml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 .github/workflows/main-last.yml diff --git a/.github/workflows/main-last.yml b/.github/workflows/main-last.yml deleted file mode 100644 index 2e8e1b56..00000000 --- a/.github/workflows/main-last.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: CI -on: - push: - branches: [ feature/github-actions-for-windows-compilers ] - pull_request: - branches: [ master ] - -jobs: - build-windows-vs2019: - name: Windows VS2019 Debug - runs-on: [windows-latest] - - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - submodules: recursive - - - name: Build - run: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" test/vs2019/etl.sln /p:Configuration=Debug /p:Platform=x86 - - - name: Run tests - run: ./test/etl_tests From c5f296bab9558c0655ebb84621eda0f4679da547 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 17:46:09 +0100 Subject: [PATCH 128/130] Add VS2019 configuration to Github CI --- .github/workflows/clang.yml | 6 +++--- .github/workflows/gcc.yml | 2 +- .github/workflows/vs2019.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml index 732b73fe..b288f3ce 100644 --- a/.github/workflows/clang.yml +++ b/.github/workflows/clang.yml @@ -1,4 +1,4 @@ -name: CI +name: CI-CLANG on: push: branches: [ feature/github-actions-for-windows-compilers ] @@ -28,7 +28,7 @@ jobs: run: ./test/etl_tests build-clang-9-linux-no-stl: - name: Clang-9 Linux No STL + name: Clang-9 Linux - No STL runs-on: ${{ matrix.os }} strategy: matrix: @@ -70,7 +70,7 @@ jobs: run: ./test/etl_tests build-clang-10-osx-no-stl: - name: Clang-10 OSX No STL + name: Clang-10 OSX - No STL runs-on: ${{ matrix.os }} strategy: matrix: diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 6c09d11f..783478f4 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -1,4 +1,4 @@ -name: CI +name: CI-GCC on: push: branches: [ feature/github-actions-for-windows-compilers ] diff --git a/.github/workflows/vs2019.yml b/.github/workflows/vs2019.yml index f1468e9a..247c69b0 100644 --- a/.github/workflows/vs2019.yml +++ b/.github/workflows/vs2019.yml @@ -1,4 +1,4 @@ -name: CI +name: CI-VS2019 on: push: branches: [ feature/github-actions-for-windows-compilers ] From d894b9c422868400ac14cbb9a7b3ba12022e1021 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 17:56:13 +0100 Subject: [PATCH 129/130] Add VS2019 configuration to Github CI --- .github/workflows/clang.yml | 2 +- .github/workflows/gcc.yml | 2 +- .github/workflows/vs2019.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml index b288f3ce..ce15296a 100644 --- a/.github/workflows/clang.yml +++ b/.github/workflows/clang.yml @@ -1,4 +1,4 @@ -name: CI-CLANG +name: CLANG on: push: branches: [ feature/github-actions-for-windows-compilers ] diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 783478f4..72e884c9 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -1,4 +1,4 @@ -name: CI-GCC +name: GCC on: push: branches: [ feature/github-actions-for-windows-compilers ] diff --git a/.github/workflows/vs2019.yml b/.github/workflows/vs2019.yml index 247c69b0..b04a21b4 100644 --- a/.github/workflows/vs2019.yml +++ b/.github/workflows/vs2019.yml @@ -1,4 +1,4 @@ -name: CI-VS2019 +name: VS2019 on: push: branches: [ feature/github-actions-for-windows-compilers ] From 35cfa5263d0bbc936ead29f69fa05f1c419311c3 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 2 Oct 2020 18:00:04 +0100 Subject: [PATCH 130/130] Add VS2019 configuration to Github CI --- .github/workflows/clang.yml | 2 +- .github/workflows/gcc.yml | 2 +- .github/workflows/vs2019.yml | 2 +- test/vs2019/etl.vcxproj | 4 +++- test/vs2019/etl.vcxproj.filters | 12 +++++++++--- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml index ce15296a..157c6e72 100644 --- a/.github/workflows/clang.yml +++ b/.github/workflows/clang.yml @@ -1,4 +1,4 @@ -name: CLANG +name: clang on: push: branches: [ feature/github-actions-for-windows-compilers ] diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 72e884c9..b0dfd872 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -1,4 +1,4 @@ -name: GCC +name: gcc on: push: branches: [ feature/github-actions-for-windows-compilers ] diff --git a/.github/workflows/vs2019.yml b/.github/workflows/vs2019.yml index b04a21b4..65c1fc62 100644 --- a/.github/workflows/vs2019.yml +++ b/.github/workflows/vs2019.yml @@ -1,4 +1,4 @@ -name: VS2019 +name: vs2019 on: push: branches: [ feature/github-actions-for-windows-compilers ] diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj index f3b511ab..5076eab2 100644 --- a/test/vs2019/etl.vcxproj +++ b/test/vs2019/etl.vcxproj @@ -1867,7 +1867,9 @@ - + + + diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters index d4ddadfb..552c83c4 100644 --- a/test/vs2019/etl.vcxproj.filters +++ b/test/vs2019/etl.vcxproj.filters @@ -1453,15 +1453,21 @@ Resource Files\CI\CircleCI - - Resource Files\CI\Github - Resource Files\Make Resource Files\CI\Appveyor + + Resource Files\CI\Github + + + Resource Files\CI\Github + + + Resource Files\CI\Github +