From 8b08cf77da24e20eb325f4edc812f0cefe6b048c Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Mon, 9 Mar 2020 01:56:38 +0300 Subject: [PATCH 01/13] Debug windows GA CI --- .github/workflows/windows-build.yml | 7 +++---- thirdparty/external_boost_deps.cmake | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 29c7fe6..2c70016 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -67,9 +67,8 @@ jobs: run: | call "%VC_VARS%" set BOOST_ROOT=%BOOST_ROOT_1_69_0% - set path=%BOOST_ROOT%\lib;%PATH% - echo "###########1 " %BOOST_ROOT% - echo "###########2 " %PATH% + set path=%BOOST_ROOT%;%BOOST_ROOT%\lib;%PATH% + set mkdir -p .build cd .build cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% -DJINJA2CPP_VERBOSE=ON -DBoost_DEBUG=ON -DBOOST_ROOT=%BOOST_ROOT_1_69_0% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% @@ -84,7 +83,7 @@ jobs: cd .build call "%VC_VARS%" set BOOST_ROOT=%BOOST_ROOT_1_69_0% - set path=%BOOST_ROOT%\lib;%PATH% + set path=%BOOST_ROOT%;%BOOST_ROOT%\lib;%PATH% echo "###########1 " %BOOST_ROOT% echo "###########2 " %PATH% ctest -C %INPUT_BUILD_CONFIG% -V diff --git a/thirdparty/external_boost_deps.cmake b/thirdparty/external_boost_deps.cmake index 0ba5f55..4f81b6f 100644 --- a/thirdparty/external_boost_deps.cmake +++ b/thirdparty/external_boost_deps.cmake @@ -1,7 +1,7 @@ if (JINJA2CPP_VERBOSE) set (FIND_BOOST_PACKAGE_QUIET) else () - set (FIND_BOOST_PACKAGE_QUIET) + set (FIND_BOOST_PACKAGE_QUIET QUIET) endif () find_package(boost_filesystem ${FIND_BOOST_PACKAGE_QUIET}) From 612306265dc28270d893d91ec6676fc181e06c32 Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Mon, 9 Mar 2020 02:06:44 +0300 Subject: [PATCH 02/13] Debug windows GA CI --- .github/workflows/windows-build.yml | 2 +- thirdparty/external_boost_deps.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 2c70016..a7d43b8 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -71,7 +71,7 @@ jobs: set mkdir -p .build cd .build - cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% -DJINJA2CPP_VERBOSE=ON -DBoost_DEBUG=ON -DBOOST_ROOT=%BOOST_ROOT_1_69_0% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% + cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% -DJINJA2CPP_VERBOSE=ON -DBoost_DEBUG=ON -DBoost_ROOT=%BOOST_ROOT_1_69_0% -DBOOST_ROOT=%BOOST_ROOT_1_69_0% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% cmake --build . --config %INPUT_BUILD_CONFIG% - name: Test diff --git a/thirdparty/external_boost_deps.cmake b/thirdparty/external_boost_deps.cmake index 4f81b6f..714a815 100644 --- a/thirdparty/external_boost_deps.cmake +++ b/thirdparty/external_boost_deps.cmake @@ -4,10 +4,10 @@ else () set (FIND_BOOST_PACKAGE_QUIET QUIET) endif () -find_package(boost_filesystem ${FIND_BOOST_PACKAGE_QUIET}) -find_package(boost_algorithm ${FIND_BOOST_PACKAGE_QUIET}) -find_package(boost_variant ${FIND_BOOST_PACKAGE_QUIET}) -find_package(boost_optional ${FIND_BOOST_PACKAGE_QUIET}) +# find_package(boost_filesystem ${FIND_BOOST_PACKAGE_QUIET}) +# find_package(boost_algorithm ${FIND_BOOST_PACKAGE_QUIET}) +# find_package(boost_variant ${FIND_BOOST_PACKAGE_QUIET}) +# find_package(boost_optional ${FIND_BOOST_PACKAGE_QUIET}) if(boost_filesystem_FOUND AND boost_algorithm_FOUND AND From f06c14b860f28cda4abf9150e288972a6bffb4c7 Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Mon, 9 Mar 2020 02:13:34 +0300 Subject: [PATCH 03/13] Debug windows GA CI --- .github/workflows/windows-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index a7d43b8..7aa0263 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -71,7 +71,7 @@ jobs: set mkdir -p .build cd .build - cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% -DJINJA2CPP_VERBOSE=ON -DBoost_DEBUG=ON -DBoost_ROOT=%BOOST_ROOT_1_69_0% -DBOOST_ROOT=%BOOST_ROOT_1_69_0% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% + cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% -DJINJA2CPP_VERBOSE=ON -DBoost_DEBUG=ON -DCMAKE_PREFIX_PATH=%BOOST_ROOT_1_69_0% -DBOOST_ROOT=%BOOST_ROOT_1_69_0% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% cmake --build . --config %INPUT_BUILD_CONFIG% - name: Test From a4690509f76eba2697897898a517065839ead541 Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Mon, 9 Mar 2020 02:38:58 +0300 Subject: [PATCH 04/13] Debug windows GA CI --- .github/workflows/windows-build.yml | 5 +---- thirdparty/external_boost_deps.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 7aa0263..a86d4e1 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -68,10 +68,9 @@ jobs: call "%VC_VARS%" set BOOST_ROOT=%BOOST_ROOT_1_69_0% set path=%BOOST_ROOT%;%BOOST_ROOT%\lib;%PATH% - set mkdir -p .build cd .build - cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% -DJINJA2CPP_VERBOSE=ON -DBoost_DEBUG=ON -DCMAKE_PREFIX_PATH=%BOOST_ROOT_1_69_0% -DBOOST_ROOT=%BOOST_ROOT_1_69_0% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% + cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% -DJINJA2CPP_VERBOSE=ON -DCMAKE_PREFIX_PATH=%BOOST_ROOT_1_69_0% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% cmake --build . --config %INPUT_BUILD_CONFIG% - name: Test @@ -84,6 +83,4 @@ jobs: call "%VC_VARS%" set BOOST_ROOT=%BOOST_ROOT_1_69_0% set path=%BOOST_ROOT%;%BOOST_ROOT%\lib;%PATH% - echo "###########1 " %BOOST_ROOT% - echo "###########2 " %PATH% ctest -C %INPUT_BUILD_CONFIG% -V diff --git a/thirdparty/external_boost_deps.cmake b/thirdparty/external_boost_deps.cmake index 714a815..4f81b6f 100644 --- a/thirdparty/external_boost_deps.cmake +++ b/thirdparty/external_boost_deps.cmake @@ -4,10 +4,10 @@ else () set (FIND_BOOST_PACKAGE_QUIET QUIET) endif () -# find_package(boost_filesystem ${FIND_BOOST_PACKAGE_QUIET}) -# find_package(boost_algorithm ${FIND_BOOST_PACKAGE_QUIET}) -# find_package(boost_variant ${FIND_BOOST_PACKAGE_QUIET}) -# find_package(boost_optional ${FIND_BOOST_PACKAGE_QUIET}) +find_package(boost_filesystem ${FIND_BOOST_PACKAGE_QUIET}) +find_package(boost_algorithm ${FIND_BOOST_PACKAGE_QUIET}) +find_package(boost_variant ${FIND_BOOST_PACKAGE_QUIET}) +find_package(boost_optional ${FIND_BOOST_PACKAGE_QUIET}) if(boost_filesystem_FOUND AND boost_algorithm_FOUND AND From 9f74de51b8224462070cb52237a84abba58ac2fd Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Mon, 9 Mar 2020 16:01:41 +0300 Subject: [PATCH 05/13] Debug windows GA CI --- .github/workflows/windows-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index a86d4e1..3e32ef0 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false max-parallel: 20 matrix: - compiler: [msvc-2019] + compiler: [msvc-2017, msvc-2019] base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17] build-config: [Release, Debug] build-platform: [x86, x64] @@ -70,7 +70,7 @@ jobs: set path=%BOOST_ROOT%;%BOOST_ROOT%\lib;%PATH% mkdir -p .build cd .build - cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% -DJINJA2CPP_VERBOSE=ON -DCMAKE_PREFIX_PATH=%BOOST_ROOT_1_69_0% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% + cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% -DJINJA2CPP_VERBOSE=ON -DBoost_DEBUG=ON %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% cmake --build . --config %INPUT_BUILD_CONFIG% - name: Test From a6bfa94a3acea0f885fa52142205642a2b257309 Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Mon, 9 Mar 2020 16:21:07 +0300 Subject: [PATCH 06/13] Debug windows GA CI --- thirdparty/external_boost_deps.cmake | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/thirdparty/external_boost_deps.cmake b/thirdparty/external_boost_deps.cmake index 4f81b6f..0185d29 100644 --- a/thirdparty/external_boost_deps.cmake +++ b/thirdparty/external_boost_deps.cmake @@ -4,6 +4,21 @@ else () set (FIND_BOOST_PACKAGE_QUIET QUIET) endif () +if (MSVC) + if (NOT DEFINED Boost_USE_STATIC_LIBS) + if (THIRDPARTY_RUNTIME_TYPE STREQUAL "/MD" OR THIRDPARTY_RUNTIME_TYPE STREQUAL "/MDd") + set (Boost_USE_STATIC_LIBS OFF) + set (Boost_USE_STATIC_RUNTIME OFF) + else () + set (Boost_USE_STATIC_LIBS ON) + set (Boost_USE_STATIC_RUNTIME ON) + endif () + if (JINJA2CPP_VERBOSE) + message (STATUS ">>>DEBUG<<< Boost_USE_STATIC_RUNTIME = ${Boost_USE_STATIC_RUNTIME}") + endif () + endif () +endif () + find_package(boost_filesystem ${FIND_BOOST_PACKAGE_QUIET}) find_package(boost_algorithm ${FIND_BOOST_PACKAGE_QUIET}) find_package(boost_variant ${FIND_BOOST_PACKAGE_QUIET}) @@ -20,21 +35,6 @@ if(boost_filesystem_FOUND AND else() - if (MSVC) - if (NOT DEFINED Boost_USE_STATIC_LIBS) - if (THIRDPARTY_RUNTIME_TYPE STREQUAL "/MD" OR THIRDPARTY_RUNTIME_TYPE STREQUAL "/MDd") - set (Boost_USE_STATIC_LIBS OFF) - set (Boost_USE_STATIC_RUNTIME OFF) - else () - set (Boost_USE_STATIC_LIBS ON) - set (Boost_USE_STATIC_RUNTIME ON) - endif () - if (JINJA2CPP_VERBOSE) - message (STATUS ">>>DEBUG<<< Boost_USE_STATIC_RUNTIME = ${Boost_USE_STATIC_RUNTIME}") - endif () - endif () - endif () - find_package(Boost COMPONENTS system filesystem ${FIND_BOOST_PACKAGE_QUIET} REQUIRED) if (Boost_FOUND) From 7020c279059457645938456062af912113d407df Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Mon, 9 Mar 2020 16:45:14 +0300 Subject: [PATCH 07/13] Debug window GA CI build --- .github/workflows/windows-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 3e32ef0..45f80d6 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -23,8 +23,8 @@ jobs: base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17] build-config: [Release, Debug] build-platform: [x86, x64] - build-runtime: [/MT] - build-shared: [FALSE] + build-runtime: ["", /MT, /MD] + build-shared: [FALSE, TRUE] include: - compiler: msvc-2017 @@ -70,7 +70,7 @@ jobs: set path=%BOOST_ROOT%;%BOOST_ROOT%\lib;%PATH% mkdir -p .build cd .build - cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% -DJINJA2CPP_VERBOSE=ON -DBoost_DEBUG=ON %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% + cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% cmake --build . --config %INPUT_BUILD_CONFIG% - name: Test From a54395c223446c64db46d29fa39c552a95affd6d Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Mon, 9 Mar 2020 17:18:20 +0300 Subject: [PATCH 08/13] Debug windows GA CI --- .github/workflows/windows-build.yml | 8 ++++++-- thirdparty/CMakeLists.txt | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 45f80d6..1b20a87 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -48,6 +48,12 @@ jobs: generator: Visual Studio 16 2019 vc_vars: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat +# exclude: +# -build-shared: TRUE +# build-runtime: "" +# -build-shared: TRUE +# build-runtime: "/MT" + steps: - uses: actions/checkout@v1 @@ -66,8 +72,6 @@ jobs: VC_VARS: "${{ matrix.vc_vars }}" run: | call "%VC_VARS%" - set BOOST_ROOT=%BOOST_ROOT_1_69_0% - set path=%BOOST_ROOT%;%BOOST_ROOT%\lib;%PATH% mkdir -p .build cd .build cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 8f250d8..4e4afef 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -12,6 +12,7 @@ if(MSVC) set (THIRDPARTY_RUNTIME_TYPE "/MD") endif() endif () + message(STATUS "Selected Jinja2C++ thirdparty libraries runtime type: '${THIRDPARTY_RUNTIME_TYPE}'") endif () function(update_submodule submodule) From ea3930e8d50edc88623a9aa0412997546be2c5ac Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Mon, 9 Mar 2020 17:41:24 +0300 Subject: [PATCH 09/13] Debug windows GA CI --- .github/workflows/windows-build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 1b20a87..b0734dd 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false max-parallel: 20 matrix: - compiler: [msvc-2017, msvc-2019] + compiler: [msvc-2019] base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17] build-config: [Release, Debug] build-platform: [x86, x64] @@ -85,6 +85,4 @@ jobs: run: | cd .build call "%VC_VARS%" - set BOOST_ROOT=%BOOST_ROOT_1_69_0% - set path=%BOOST_ROOT%;%BOOST_ROOT%\lib;%PATH% ctest -C %INPUT_BUILD_CONFIG% -V From d585c60ad69c20a7b4a76a599f980358d65bff86 Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Mon, 9 Mar 2020 17:47:06 +0300 Subject: [PATCH 10/13] Debug windows GA CI --- .github/workflows/windows-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index b0734dd..8272cf8 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -85,4 +85,5 @@ jobs: run: | cd .build call "%VC_VARS%" + set path=%BOOST_ROOT%\lib;%PATH% ctest -C %INPUT_BUILD_CONFIG% -V From b0b5f6666df536f273c3e69fd2f6f9d861ecabfd Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Mon, 9 Mar 2020 18:10:45 +0300 Subject: [PATCH 11/13] Debug windows GA CI --- .github/workflows/windows-build.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 8272cf8..876adea 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false max-parallel: 20 matrix: - compiler: [msvc-2019] + compiler: [msvc-2019, msvc-2017] base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17] build-config: [Release, Debug] build-platform: [x86, x64] @@ -48,12 +48,6 @@ jobs: generator: Visual Studio 16 2019 vc_vars: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat -# exclude: -# -build-shared: TRUE -# build-runtime: "" -# -build-shared: TRUE -# build-runtime: "/MT" - steps: - uses: actions/checkout@v1 From 9e342a55a8ef6fefd348418718bef9bf4ceceb73 Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Tue, 10 Mar 2020 18:11:50 +0300 Subject: [PATCH 12/13] Test boost library find --- .github/workflows/linux-build.yml | 135 ---------------------------- .github/workflows/windows-build.yml | 15 ++-- .travis.yml | 67 -------------- appveyor.yml | 89 ------------------ 4 files changed, 8 insertions(+), 298 deletions(-) delete mode 100644 .github/workflows/linux-build.yml delete mode 100644 .travis.yml delete mode 100644 appveyor.yml diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml deleted file mode 100644 index 7088948..0000000 --- a/.github/workflows/linux-build.yml +++ /dev/null @@ -1,135 +0,0 @@ -name: CI-linux-build - - -on: - push: - paths-ignore: - - 'docs/**' - - '**.md' - pull_request: - paths-ignore: - - 'docs/**' - - '**.md' - -jobs: - linux-gcc-build: - - runs-on: ubuntu-latest - - strategy: - fail-fast: false - max-parallel: 8 - matrix: - compiler: [gcc-8, gcc-6, gcc-7, gcc-5, gcc-9] - base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17] - build-config: [Release, Debug] - build-shared: [TRUE, FALSE] - - include: - - compiler: gcc-8 - extra-flags: -DJINJA2CPP_STRICT_WARNINGS=OFF - - compiler: gcc-9 - extra-flags: -DJINJA2CPP_STRICT_WARNINGS=OFF - - exclude: - - compiler: gcc-5 - base-flags: -DJINJA2CPP_CXX_STANDARD=17 - - compiler: gcc-6 - base-flags: -DJINJA2CPP_CXX_STANDARD=17 - - steps: - - uses: actions/checkout@v1 - - name: Setup environment - env: - INPUT_COMPILER: ${{ matrix.compiler }} - INPUT_BASE_FLAGS: ${{ matrix.base-flags }} - INPUT_BASE_CONFIG: ${{ matrix.build-config }} - INPUT_EXTRA_FLAGS: ${{ matrix.extra-flags }} - run: | - sudo apt-get update - sudo apt-get install -y cmake build-essential ${INPUT_COMPILER} - - name: Prepare build - env: - INPUT_COMPILER: ${{ matrix.compiler }} - INPUT_BASE_FLAGS: ${{ matrix.base-flags }} - INPUT_BASE_CONFIG: ${{ matrix.build-config }} - INPUT_EXTRA_FLAGS: ${{ matrix.extra-flags }} - run: | - export BUILD_TARGET=all - export CMAKE_OPTS=-DCMAKE_VERBOSE_MAKEFILE=OFF - if [[ "${INPUT_COMPILER}" != "" ]]; then export CXX=${INPUT_COMPILER}; fi - export BUILD_CONFIG=${INPUT_BUILD_CONFIG} - $CXX --version - export EXTRA_FLAGS="${INPUT_BASE_FLAGS} ${INPUT_EXTRA_FLAGS}" - - - name: Build - env: - INPUT_BUILD_SHARED: ${{ matrix.build-shared }} - run: | - mkdir -p .build && cd .build - cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS -DJINJA2CPP_DEPS_MODE=internal -DJINJA2CPP_BUILD_SHARED=$INPUT_BUILD_SHARED $EXTRA_FLAGS .. && cmake --build . --config $BUILD_CONFIG --target all -- -j4 - - - name: Test - run: | - cd .build && ctest -C $BUILD_CONFIG -V - - linux-clang-build: - - runs-on: ubuntu-18.04 - container: - image: ${{matrix.docker-image}} - env: - BUILD_DIRECTORY: /home/conan/.build - HOME: /home/conan - - strategy: - fail-fast: false - max-parallel: 8 - matrix: - compiler: [5.0, 6.0, 7, 8] - base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17] - build-config: [Release, Debug] - build-shared: [TRUE, FALSE] - - include: - - compiler: 5.0 - docker-image: conanio/clang50 - - compiler: 6.0 - docker-image: conanio/clang60 - - compiler: 7 - docker-image: conanio/clang7 - - compiler: 8 - docker-image: conanio/clang8 - - compiler: 9 - docker-image: conanio/clang9 - - exclude: - - compiler: 5.0 - base-flags: -DJINJA2CPP_CXX_STANDARD=17 - steps: - - uses: actions/checkout@v1 - - - name: Build - env: - INPUT_COMPILER: clang-${{ matrix.compiler }} - INPUT_BASE_FLAGS: ${{ matrix.base-flags }} - INPUT_BASE_CONFIG: ${{ matrix.build-config }} - INPUT_EXTRA_FLAGS: ${{ matrix.extra-flags }} - INPUT_BUILD_SHARED: ${{ matrix.build-shared }} - HOME: /home/conan - run: | - export BUILD_TARGET=all - export CMAKE_OPTS=-DCMAKE_VERBOSE_MAKEFILE=OFF - export BUILD_CONFIG=${INPUT_BUILD_CONFIG} - export WORKSPACE=$GITHUB_WORKSPACE - $CXX --version - export EXTRA_FLAGS="${INPUT_BASE_FLAGS} ${INPUT_EXTRA_FLAGS}" - mkdir $BUILD_DIRECTORY && cd $BUILD_DIRECTORY - sudo chmod gou+rw -R $WORKSPACE - cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS -DJINJA2CPP_DEPS_MODE=internal -DJINJA2CPP_BUILD_SHARED=$INPUT_BUILD_SHARED $EXTRA_FLAGS $WORKSPACE && cmake --build . --config $BUILD_CONFIG --target all -- -j4 - - - name: Test - run: | - cd $BUILD_DIRECTORY - ctest -C $BUILD_CONFIG -V - diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 876adea..b0fc6c5 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -19,12 +19,12 @@ jobs: fail-fast: false max-parallel: 20 matrix: - compiler: [msvc-2019, msvc-2017] - base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17] - build-config: [Release, Debug] - build-platform: [x86, x64] - build-runtime: ["", /MT, /MD] - build-shared: [FALSE, TRUE] + compiler: [msvc-2019] + base-flags: [""] + build-config: [Release] + build-platform: [x64] + build-runtime: [/MT] + build-shared: [FALSE] include: - compiler: msvc-2017 @@ -67,8 +67,9 @@ jobs: run: | call "%VC_VARS%" mkdir -p .build + rmdir /S /Q C:/hostedtoolcache/windows/Boost/1.72.0/lib/cmake cd .build - cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% + cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DBoost_DEBUG=TRUE -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% cmake --build . --config %INPUT_BUILD_CONFIG% - name: Test diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 36bd8f1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ ---- -dist: xenial -language: cpp -sudo: required - -matrix: - include: - - - compiler: clang - env: COMPILER='clang++' - os: osx - osx_image: xcode9 - - - compiler: clang - env: COMPILER='clang++' - os: osx - osx_image: xcode10 - - - compiler: clang - env: COMPILER='clang++' - os: osx - osx_image: xcode11 - - - addons: - apt: - packages: - - cmake - - g++-6 - - lcov - sources: - - ubuntu-toolchain-r-test - compiler: gcc - env: "COMPILER=g++-6 COLLECT_COVERAGE=1" - os: linux - - - addons: - apt: - packages: - - cmake - - clang-8 - - g++-8 - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-8 - compiler: clang - env: "COMPILER=clang++-8 EXTRA_FLAGS=-DJINJA2CPP_CXX_STANDARD=17 SANITIZE_BUILD=address+undefined" - os: linux -before_install: - - "date -u" - - "uname -a" -script: - - "export BUILD_TARGET=\"all\"" - - "export CMAKE_OPTS=\"-DCMAKE_VERBOSE_MAKEFILE=OFF\"" - - "if [[ \"${COMPILER}\" != \"\" ]]; then export CXX=${COMPILER}; fi" - - "if [[ \"${BUILD_CONFIG}\" == \"\" ]]; then export BUILD_CONFIG=\"Release\"; fi" - - "if [[ \"${COLLECT_COVERAGE}\" != \"\" ]]; then export BUILD_CONFIG=\"Debug\" && export CMAKE_OPTS=\"${CMAKE_OPTS} -DJINJA2CPP_WITH_COVERAGE=ON\"; fi" - - "if [[ \"${SANITIZE_BUILD}\" != \"\" ]]; then export BUILD_CONFIG=\"RelWithDebInfo\" && export CMAKE_OPTS=\"${CMAKE_OPTS} -DJINJA2CPP_WITH_SANITIZERS=${SANITIZE_BUILD}\"; fi" - - "$CXX --version" - - "mkdir -p build && cd build" - - "cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS -DJINJA2CPP_DEPS_MODE=internal $EXTRA_FLAGS .. && cmake --build . --config $BUILD_CONFIG --target all -- -j4" - - "ctest -C $BUILD_CONFIG -V" -after_success: - - "if [[ \"${COLLECT_COVERAGE}\" != \"\" ]]; then echo \"Uploading code coverate report\" ; fi" - - "if [[ \"${COLLECT_COVERAGE}\" != \"\" ]]; then lcov --directory . --capture --output-file coverage.info ; fi" - - "if [[ \"${COLLECT_COVERAGE}\" != \"\" ]]; then lcov --remove coverage.info '/usr/*' --output-file coverage.info ; fi" - - "if [[ \"${COLLECT_COVERAGE}\" != \"\" ]]; then lcov --list coverage.info ; fi" - - "if [[ \"${COLLECT_COVERAGE}\" != \"\" ]]; then bash <(curl -s https://codecov.io/bash) -t \"225d6d7a-2b71-4dbe-bf87-fbf75eb7c119\" || echo \"Codecov did not collect coverage reports\"; fi" diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index c17caeb..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,89 +0,0 @@ -version: 1.0.0.{build} - -os: - - Visual Studio 2015 - - Visual Studio 2017 - -platform: - - Win32 - - x64 - -configuration: - - Debug - - Release - -environment: - BOOST_ROOT: C:\Libraries\boost_1_65_1 - GENERATOR: "\"NMake Makefiles\"" - DEPS_MODE: external-boost - - matrix: -# - BUILD_PLATFORM: clang -# MSVC_RUNTIME_TYPE: -# GENERATOR: "\"Unix Makefiles\"" -# DEPS_MODE: internal -# EXTRA_CMAKE_ARGS: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DJINJA2CPP_STRICT_WARNINGS=OFF - - BUILD_PLATFORM: MinGW7 - MSVC_RUNTIME_TYPE: - GENERATOR: "\"Unix Makefiles\"" - DEPS_MODE: internal - EXTRA_CMAKE_ARGS: -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc.exe -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++.exe -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DJINJA2CPP_STRICT_WARNINGS=OFF - - BUILD_PLATFORM: MinGW8 - MSVC_RUNTIME_TYPE: - GENERATOR: "\"Unix Makefiles\"" - DEPS_MODE: internal - EXTRA_CMAKE_ARGS: -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc.exe -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++.exe -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DJINJA2CPP_STRICT_WARNINGS=OFF - - BUILD_PLATFORM: x64 - MSVC_RUNTIME_TYPE: /MD - - BUILD_PLATFORM: x64 - MSVC_RUNTIME_TYPE: /MT - - BUILD_PLATFORM: x64 - MSVC_RUNTIME_TYPE: - - BUILD_PLATFORM: x86 - MSVC_RUNTIME_TYPE: /MD - - BUILD_PLATFORM: x86 - MSVC_RUNTIME_TYPE: /MT - - BUILD_PLATFORM: x86 - MSVC_RUNTIME_TYPE: - -matrix: - fast_finish: false - exclude: - - os: Visual Studio 2015 - BUILD_PLATFORM: MinGW7 - - os: Visual Studio 2015 - BUILD_PLATFORM: MinGW8 - - os: Visual Studio 2015 - BUILD_PLATFORM: clang - - os: Visual Studio 2017 - BUILD_PLATFORM: x86 - - os: Visual Studio 2017 - BUILD_PLATFORM: x64 - - platform: Win32 - BUILD_PLATFORM: x64 - - platform: Win32 - BUILD_PLATFORM: MinGW7 - - platform: Win32 - BUILD_PLATFORM: MinGW8 - - platform: Win32 - BUILD_PLATFORM: clang - - platform: x64 - BUILD_PLATFORM: x86 - - -init: - - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%BUILD_PLATFORM%"=="MinGW7" set PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH% - - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%BUILD_PLATFORM%"=="MinGW8" set PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH% - - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%BUILD_PLATFORM%"=="clang" set PATH=%BOOST_ROOT%\lib64-msvc-14.1;C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin;C:\Libraries\llvm-5.0.0\bin;%PATH% && call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" - - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%BUILD_PLATFORM%"=="x86" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%BUILD_PLATFORM%"=="x86" set PATH=%BOOST_ROOT%\lib32-msvc-14.0;%PATH% - - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%BUILD_PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%BUILD_PLATFORM%"=="x64" set PATH=%BOOST_ROOT%\lib64-msvc-14.0;%PATH% - -build_script: - - mkdir -p build && cd build - - cmake .. -G %GENERATOR% -DCMAKE_BUILD_TYPE=%configuration% -DJINJA2CPP_MSVC_RUNTIME_TYPE=%MSVC_RUNTIME_TYPE% -DJINJA2CPP_DEPS_MODE=%DEPS_MODE% %EXTRA_CMAKE_ARGS% - - cmake --build . --target all --config %configuration% - -test_script: - - ctest -C %configuration% -V From 07bfcf6423e75307472544aceeba1b2864ab31a2 Mon Sep 17 00:00:00 2001 From: Flex Ferrum Date: Tue, 10 Mar 2020 18:15:17 +0300 Subject: [PATCH 13/13] Fix path --- .github/workflows/windows-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index b0fc6c5..aa28af5 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -67,7 +67,7 @@ jobs: run: | call "%VC_VARS%" mkdir -p .build - rmdir /S /Q C:/hostedtoolcache/windows/Boost/1.72.0/lib/cmake + rmdir /S /Q C:\hostedtoolcache\windows\Boost\1.72.0\lib\cmake cd .build cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DBoost_DEBUG=TRUE -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS% cmake --build . --config %INPUT_BUILD_CONFIG%