fix workflows

Author: rmorozov

.github/workflows/linux-build.yml

@@ -20,22 +20,18 @@ jobs:
       fail-fast: false
       max-parallel: 8
       matrix:
-        compiler: [gcc-8, gcc-6, gcc-7, gcc-5, gcc-9]
+        compiler: [g++-9, g++10, g++11]
         base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17]
         build-config: [Release, Debug]
         build-shared: [TRUE, FALSE]
 
         include:
-          - compiler: gcc-8
+          - compiler: g++-9
             extra-flags: -DJINJA2CPP_STRICT_WARNINGS=OFF
-          - compiler: gcc-9
+          - compiler: g++-10
+            extra-flags: -DJINJA2CPP_STRICT_WARNINGS=OFF
+          - compiler: g++-11
             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
@@ -100,26 +96,19 @@ jobs:
       fail-fast: false
       max-parallel: 8
       matrix:
-        compiler: [5.0, 6.0, 7, 8]
+        compiler: [10, 11, 12]
         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
+          - compiler: 10
+            docker-image: conanio/clang10
+          - compiler: 11
+            docker-image: conanio/clang11
+          - compiler: 12
+            docker-image: conanio/clang12
+
     steps:
     - uses: actions/checkout@v1
 

.github/workflows/windows-build.yml

@@ -68,7 +68,7 @@ jobs:
         call "%VC_VARS%"
         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%
+        cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=internal -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS%
         cmake --build . --config %INPUT_BUILD_CONFIG%
 
     - name: Test

thirdparty/external_boost_deps.cmake

@@ -32,8 +32,6 @@ if(boost_filesystem_FOUND AND
    imported_target_alias(boost_algorithm  ALIAS boost_algorithm::boost_algorithm)
    imported_target_alias(boost_variant    ALIAS boost_variant::boost_variant)
    imported_target_alias(boost_optional   ALIAS boost_optional::boost_optional)
-   
-   
 else()
     find_package(Boost COMPONENTS system filesystem ${FIND_BOOST_PACKAGE_QUIET} REQUIRED)
 
@@ -51,4 +49,4 @@ install(TARGETS boost_filesystem boost_algorithm boost_variant boost_optional
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static
         PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/boost
-        )
+        )