From 07643888b57de040cba66e63282f68da307a5e92 Mon Sep 17 00:00:00 2001 From: Roman Ukhov Date: Fri, 26 Jan 2024 13:59:43 +0200 Subject: [PATCH 01/12] initial commit --- .github/workflows/build.yml | 24 ++++++++++++++++++++++++ CMakeLists.txt | 12 ++++++++++++ src/0.clean.all.cmd | 2 ++ src/1.generate.solution.cmd | 4 ++++ src/2.build.all.cmd | 8 ++++++++ src/CMakeLists.txt | 12 ++++++++++++ src/src/tests/CMakeLists.txt | 13 +++++++++++++ src/src/tests/main.cpp | 7 +++++++ src/src/tests/stdafx.h | 2 ++ 9 files changed, 84 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 CMakeLists.txt create mode 100644 src/0.clean.all.cmd create mode 100644 src/1.generate.solution.cmd create mode 100644 src/2.build.all.cmd create mode 100644 src/CMakeLists.txt create mode 100644 src/src/tests/CMakeLists.txt create mode 100644 src/src/tests/main.cpp create mode 100644 src/src/tests/stdafx.h diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..884b4e8 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,24 @@ + +name: Build the project +run-name: Build the project on behalf of ${{ github.actor }} +on: + workflow_dispatch: + pull_request: + types: [opened, synchronize, reopened] + push: + branches: + - dev +jobs: + build: + runs-on: windows-latest + + steps: + + - name: Checkout + uses: actions/checkout@v4 + + - name: Generate solution + run: .\1.generate.solution.cmd + + - name: Build solution + run: .\2.build.all.cmd diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..c0ebb17 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,12 @@ + +cmake_minimum_required(VERSION 3.26) + +project(windows.pep VERSION 1.0.0 LANGUAGES CXX C) + +set(CMAKE_CXX_STANDARD 23) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS Off) + +find_package("Boost" REQUIRED) + +add_subdirectory(src/tests) diff --git a/src/0.clean.all.cmd b/src/0.clean.all.cmd new file mode 100644 index 0000000..c59e8c4 --- /dev/null +++ b/src/0.clean.all.cmd @@ -0,0 +1,2 @@ + +rmdir .\build /s /q diff --git a/src/1.generate.solution.cmd b/src/1.generate.solution.cmd new file mode 100644 index 0000000..1a4af10 --- /dev/null +++ b/src/1.generate.solution.cmd @@ -0,0 +1,4 @@ + +cmake -S ./ -B ./build -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;RelWithDebInfo" + +if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/src/2.build.all.cmd b/src/2.build.all.cmd new file mode 100644 index 0000000..6531994 --- /dev/null +++ b/src/2.build.all.cmd @@ -0,0 +1,8 @@ + +cmake --build .\build --config "Debug" + +if %errorlevel% neq 0 exit /b %errorlevel% + +cmake --build .\build --config "RelWithDebInfo" + +if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..c0ebb17 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,12 @@ + +cmake_minimum_required(VERSION 3.26) + +project(windows.pep VERSION 1.0.0 LANGUAGES CXX C) + +set(CMAKE_CXX_STANDARD 23) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS Off) + +find_package("Boost" REQUIRED) + +add_subdirectory(src/tests) diff --git a/src/src/tests/CMakeLists.txt b/src/src/tests/CMakeLists.txt new file mode 100644 index 0000000..aec37b7 --- /dev/null +++ b/src/src/tests/CMakeLists.txt @@ -0,0 +1,13 @@ + +set( MODULE_NAME ${CMAKE_PROJECT_NAME}.unit.tests) + +project(${MODULE_NAME} VERSION 1.0.0 LANGUAGES CXX C) + +file(GLOB_RECURSE UnitTests_Src + *.cpp + *.h +) + +add_executable(${MODULE_NAME} WIN32 ${UnitTests_Src} ) +set_target_properties(${MODULE_NAME} PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE" ) +target_precompile_headers(${MODULE_NAME} PRIVATE stdafx.h) diff --git a/src/src/tests/main.cpp b/src/src/tests/main.cpp new file mode 100644 index 0000000..b87b6db --- /dev/null +++ b/src/src/tests/main.cpp @@ -0,0 +1,7 @@ + +int main(int argc, const char* argv[]) +{ + std::cout << "This is placeholder project for unit tests.\n"; + + return 0; +} diff --git a/src/src/tests/stdafx.h b/src/src/tests/stdafx.h new file mode 100644 index 0000000..505da94 --- /dev/null +++ b/src/src/tests/stdafx.h @@ -0,0 +1,2 @@ + +#include From 401bde3067d603f56ba8716a14d8e7066c33ad64 Mon Sep 17 00:00:00 2001 From: Roman Ukhov Date: Fri, 26 Jan 2024 14:01:28 +0200 Subject: [PATCH 02/12] add scripts --- 0.clean.all.cmd | 2 ++ 1.generate.solution.cmd | 4 ++++ 2.build.all.cmd | 8 ++++++++ 3 files changed, 14 insertions(+) create mode 100644 0.clean.all.cmd create mode 100644 1.generate.solution.cmd create mode 100644 2.build.all.cmd diff --git a/0.clean.all.cmd b/0.clean.all.cmd new file mode 100644 index 0000000..c59e8c4 --- /dev/null +++ b/0.clean.all.cmd @@ -0,0 +1,2 @@ + +rmdir .\build /s /q diff --git a/1.generate.solution.cmd b/1.generate.solution.cmd new file mode 100644 index 0000000..1a4af10 --- /dev/null +++ b/1.generate.solution.cmd @@ -0,0 +1,4 @@ + +cmake -S ./ -B ./build -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;RelWithDebInfo" + +if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/2.build.all.cmd b/2.build.all.cmd new file mode 100644 index 0000000..6531994 --- /dev/null +++ b/2.build.all.cmd @@ -0,0 +1,8 @@ + +cmake --build .\build --config "Debug" + +if %errorlevel% neq 0 exit /b %errorlevel% + +cmake --build .\build --config "RelWithDebInfo" + +if %errorlevel% neq 0 exit /b %errorlevel% From d2f5b45877b8ab4cda17e565a2047dada9ffdab7 Mon Sep 17 00:00:00 2001 From: Roman Ukhov Date: Fri, 26 Jan 2024 18:46:26 +0200 Subject: [PATCH 03/12] integrate conan --- .gitignore | 3 ++ 1.resolve.dependencies.cmd | 10 ++++++ ...te.solution.cmd => 2.generate.solution.cmd | 2 +- 2.build.all.cmd => 3.build.all.cmd | 0 CMakeLists.txt | 17 +++++++++- conanfile.py | 12 +++++++ src/0.clean.all.cmd | 2 -- src/1.generate.solution.cmd | 4 --- src/2.build.all.cmd | 8 ----- src/CMakeLists.txt | 12 ------- src/src/tests/main.cpp | 7 ----- src/{src => }/tests/CMakeLists.txt | 5 +++ src/tests/main.cpp | 31 +++++++++++++++++++ src/{src => }/tests/stdafx.h | 0 14 files changed, 78 insertions(+), 35 deletions(-) create mode 100644 .gitignore create mode 100644 1.resolve.dependencies.cmd rename 1.generate.solution.cmd => 2.generate.solution.cmd (51%) rename 2.build.all.cmd => 3.build.all.cmd (100%) create mode 100644 conanfile.py delete mode 100644 src/0.clean.all.cmd delete mode 100644 src/1.generate.solution.cmd delete mode 100644 src/2.build.all.cmd delete mode 100644 src/CMakeLists.txt delete mode 100644 src/src/tests/main.cpp rename src/{src => }/tests/CMakeLists.txt (63%) create mode 100644 src/tests/main.cpp rename src/{src => }/tests/stdafx.h (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9489afe --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ + +build/ +CMakeUserPresets.json diff --git a/1.resolve.dependencies.cmd b/1.resolve.dependencies.cmd new file mode 100644 index 0000000..b5203d8 --- /dev/null +++ b/1.resolve.dependencies.cmd @@ -0,0 +1,10 @@ + +::conan install . --output-folder=build/conan --build=missing + +conan install . --output-folder=build/conan --build=missing -s build_type=RelWithDebInfo + +if %errorlevel% neq 0 exit /b %errorlevel% + +conan install . --output-folder=build/conan --build=missing -s build_type=Debug + +if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/1.generate.solution.cmd b/2.generate.solution.cmd similarity index 51% rename from 1.generate.solution.cmd rename to 2.generate.solution.cmd index 1a4af10..7a3b9c0 100644 --- a/1.generate.solution.cmd +++ b/2.generate.solution.cmd @@ -1,4 +1,4 @@ -cmake -S ./ -B ./build -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;RelWithDebInfo" +cmake -S ./ -B ./build -G "Visual Studio 17 2022" -A x64 -DCMAKE_TOOLCHAIN_FILE=./build/conan/conan_toolchain.cmake -DCMAKE_CONFIGURATION_TYPES="Debug;RelWithDebInfo" if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/2.build.all.cmd b/3.build.all.cmd similarity index 100% rename from 2.build.all.cmd rename to 3.build.all.cmd diff --git a/CMakeLists.txt b/CMakeLists.txt index c0ebb17..662d282 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,21 @@ set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED On) set(CMAKE_CXX_EXTENSIONS Off) -find_package("Boost" REQUIRED) +#if(EXISTS "${CMAKE_BINARY_DIR}/conan/conanbuildinfo.cmake") +#include(${CMAKE_BINARY_DIR}/conan/conanbuildinfo.cmake) +#endif() + +#conan_basic_setup() + +find_package("Boost" 1.84.0 COMPONENTS test thread log log_setup REQUIRED) + +message( "CMAKE_BINARY_DIR: " ${CMAKE_BINARY_DIR} ) +message( "CONAN_INCLUDE_DIRS: " ${CONAN_INCLUDE_DIRS} ) +message( "CMAKE_INCLUDE_PATH: " ${CMAKE_INCLUDE_PATH} ) +message( "CMAKE_LIBRARY_PATH: " ${CMAKE_LIBRARY_PATH} ) +message( "CONAN_LIBS: " ${CONAN_LIBS} ) +#include_directories(${CONAN_INCLUDE_DIRS}) +include_directories(${CMAKE_INCLUDE_PATH}) +#CMAKE_LIBRARY_PATH add_subdirectory(src/tests) diff --git a/conanfile.py b/conanfile.py new file mode 100644 index 0000000..7525426 --- /dev/null +++ b/conanfile.py @@ -0,0 +1,12 @@ +from conan import ConanFile + + +class WindowsPEP(ConanFile): + settings = "os", "compiler", "build_type", "arch" + generators = "CMakeToolchain", "CMakeDeps" + + def requirements(self): + self.requires("boost/1.84.0") + +# def build_requirements(self): +# self.tool_requires("cmake/3.26.0") diff --git a/src/0.clean.all.cmd b/src/0.clean.all.cmd deleted file mode 100644 index c59e8c4..0000000 --- a/src/0.clean.all.cmd +++ /dev/null @@ -1,2 +0,0 @@ - -rmdir .\build /s /q diff --git a/src/1.generate.solution.cmd b/src/1.generate.solution.cmd deleted file mode 100644 index 1a4af10..0000000 --- a/src/1.generate.solution.cmd +++ /dev/null @@ -1,4 +0,0 @@ - -cmake -S ./ -B ./build -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES="Debug;RelWithDebInfo" - -if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/src/2.build.all.cmd b/src/2.build.all.cmd deleted file mode 100644 index 6531994..0000000 --- a/src/2.build.all.cmd +++ /dev/null @@ -1,8 +0,0 @@ - -cmake --build .\build --config "Debug" - -if %errorlevel% neq 0 exit /b %errorlevel% - -cmake --build .\build --config "RelWithDebInfo" - -if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index c0ebb17..0000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -cmake_minimum_required(VERSION 3.26) - -project(windows.pep VERSION 1.0.0 LANGUAGES CXX C) - -set(CMAKE_CXX_STANDARD 23) -set(CMAKE_CXX_STANDARD_REQUIRED On) -set(CMAKE_CXX_EXTENSIONS Off) - -find_package("Boost" REQUIRED) - -add_subdirectory(src/tests) diff --git a/src/src/tests/main.cpp b/src/src/tests/main.cpp deleted file mode 100644 index b87b6db..0000000 --- a/src/src/tests/main.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -int main(int argc, const char* argv[]) -{ - std::cout << "This is placeholder project for unit tests.\n"; - - return 0; -} diff --git a/src/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt similarity index 63% rename from src/src/tests/CMakeLists.txt rename to src/tests/CMakeLists.txt index aec37b7..6a69ebb 100644 --- a/src/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -8,6 +8,11 @@ file(GLOB_RECURSE UnitTests_Src *.h ) +include_directories(${CONAN_INCLUDE_DIRS}) + add_executable(${MODULE_NAME} WIN32 ${UnitTests_Src} ) set_target_properties(${MODULE_NAME} PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE" ) target_precompile_headers(${MODULE_NAME} PRIVATE stdafx.h) +target_link_libraries( ${MODULE_NAME} Boost::unit_test_framework ) +#target_link_libraries( ${MODULE_NAME} Boost ) +#target_link_libraries(timer ${CONAN_LIBS}) diff --git a/src/tests/main.cpp b/src/tests/main.cpp new file mode 100644 index 0000000..6aa71bc --- /dev/null +++ b/src/tests/main.cpp @@ -0,0 +1,31 @@ +//#define BOOST_TEST_MODULE MyTest +//#include +//#include + +//BOOST_AUTO_TEST_CASE( my_test ) +//{ +// BOOST_CHECK( false ); +//} + +#define BOOST_TEST_MODULE PoltavaUnitTests +#include + +BOOST_AUTO_TEST_CASE( TestCase_1 ) +{ + BOOST_TEST( true ); +} + +BOOST_AUTO_TEST_CASE( TestCase_2 ) +{ + BOOST_TEST( true ); +} + +/* +int main(int argc, const char* argv[]) +{ + std::cout << "This is placeholder project for unit tests.\n"; + + return 0; +} +*/ \ No newline at end of file diff --git a/src/src/tests/stdafx.h b/src/tests/stdafx.h similarity index 100% rename from src/src/tests/stdafx.h rename to src/tests/stdafx.h From 45d2ac16128b52854681d6b9e1d07eca2ccc90a1 Mon Sep 17 00:00:00 2001 From: Roman Ukhov Date: Fri, 26 Jan 2024 18:49:14 +0200 Subject: [PATCH 04/12] update workflow --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 884b4e8..f21c19e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Resolve dependencies + run: .\1.resolve.dependencies.cmd + - name: Generate solution - run: .\1.generate.solution.cmd + run: .\2.generate.solution.cmd - name: Build solution - run: .\2.build.all.cmd + run: .\3.build.all.cmd From 8706c5d8f9b1af01e4e658c661610a174126a9b3 Mon Sep 17 00:00:00 2001 From: Roman Ukhov Date: Fri, 26 Jan 2024 18:56:49 +0200 Subject: [PATCH 05/12] install conan step added --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f21c19e..1c18fe0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,9 @@ jobs: steps: + - name: Install Conan + run: pip3 install conan==1.57.0 --force + - name: Checkout uses: actions/checkout@v4 From df443f3569af84ff2f4d8df7e911f49e737c38f8 Mon Sep 17 00:00:00 2001 From: Roman Ukhov Date: Fri, 26 Jan 2024 20:05:38 +0200 Subject: [PATCH 06/12] update --- .github/workflows/build.yml | 5 ++++- 1.resolve.dependencies.cmd | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c18fe0..45580e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,10 @@ jobs: steps: - name: Install Conan - run: pip3 install conan==1.57.0 --force + run: pip3 install conan + + - name: Conan version + run: conan --version - name: Checkout uses: actions/checkout@v4 diff --git a/1.resolve.dependencies.cmd b/1.resolve.dependencies.cmd index b5203d8..43b688c 100644 --- a/1.resolve.dependencies.cmd +++ b/1.resolve.dependencies.cmd @@ -1,10 +1,12 @@ ::conan install . --output-folder=build/conan --build=missing -conan install . --output-folder=build/conan --build=missing -s build_type=RelWithDebInfo +set CUR_DIR=%CD% + +conan install . --output-folder=%CUR_DIR%/build/conan --build=missing -s build_type=RelWithDebInfo if %errorlevel% neq 0 exit /b %errorlevel% -conan install . --output-folder=build/conan --build=missing -s build_type=Debug +conan install . --output-folder=%CUR_DIR%/build/conan --build=missing -s build_type=Debug if %errorlevel% neq 0 exit /b %errorlevel% From b5f1121854f5c73d809a150ae502eac2e01e5d3c Mon Sep 17 00:00:00 2001 From: Roman Ukhov Date: Fri, 26 Jan 2024 20:09:42 +0200 Subject: [PATCH 07/12] update --- 1.resolve.dependencies.cmd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/1.resolve.dependencies.cmd b/1.resolve.dependencies.cmd index 43b688c..87196c2 100644 --- a/1.resolve.dependencies.cmd +++ b/1.resolve.dependencies.cmd @@ -1,6 +1,8 @@ ::conan install . --output-folder=build/conan --build=missing +conan profile detect --force + set CUR_DIR=%CD% conan install . --output-folder=%CUR_DIR%/build/conan --build=missing -s build_type=RelWithDebInfo From 2d5f5d333d81e5d1ba39afca17968411609ee047 Mon Sep 17 00:00:00 2001 From: Roman Ukhov Date: Fri, 26 Jan 2024 20:17:45 +0200 Subject: [PATCH 08/12] update --- 1.resolve.dependencies.cmd | 8 +++----- 2.generate.solution.cmd | 2 +- 3.build.all.cmd | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/1.resolve.dependencies.cmd b/1.resolve.dependencies.cmd index 87196c2..40a3c65 100644 --- a/1.resolve.dependencies.cmd +++ b/1.resolve.dependencies.cmd @@ -5,10 +5,8 @@ conan profile detect --force set CUR_DIR=%CD% -conan install . --output-folder=%CUR_DIR%/build/conan --build=missing -s build_type=RelWithDebInfo - -if %errorlevel% neq 0 exit /b %errorlevel% - -conan install . --output-folder=%CUR_DIR%/build/conan --build=missing -s build_type=Debug +::conan install . --output-folder=%CUR_DIR%\build\conan --build=missing -s build_type=RelWithDebInfo +::if %errorlevel% neq 0 exit /b %errorlevel% +conan install . --output-folder=%CUR_DIR%\build\conan --build=missing -s build_type=Debug if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/2.generate.solution.cmd b/2.generate.solution.cmd index 7a3b9c0..e638134 100644 --- a/2.generate.solution.cmd +++ b/2.generate.solution.cmd @@ -1,4 +1,4 @@ -cmake -S ./ -B ./build -G "Visual Studio 17 2022" -A x64 -DCMAKE_TOOLCHAIN_FILE=./build/conan/conan_toolchain.cmake -DCMAKE_CONFIGURATION_TYPES="Debug;RelWithDebInfo" +cmake -S .\ -B .\build -G "Visual Studio 17 2022" -A x64 -DCMAKE_TOOLCHAIN_FILE=.\build\conan\conan_toolchain.cmake -DCMAKE_CONFIGURATION_TYPES="Debug;RelWithDebInfo" if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/3.build.all.cmd b/3.build.all.cmd index 6531994..0e6589b 100644 --- a/3.build.all.cmd +++ b/3.build.all.cmd @@ -1,8 +1,6 @@ cmake --build .\build --config "Debug" - if %errorlevel% neq 0 exit /b %errorlevel% -cmake --build .\build --config "RelWithDebInfo" - -if %errorlevel% neq 0 exit /b %errorlevel% +::cmake --build .\build --config "RelWithDebInfo" +::if %errorlevel% neq 0 exit /b %errorlevel% From d340401bd873bb26a2b122b8459f59365c132829 Mon Sep 17 00:00:00 2001 From: Roman Ukhov Date: Mon, 29 Jan 2024 13:03:29 +0200 Subject: [PATCH 09/12] try cache --- .github/workflows/build.yml | 16 +++++++++++++++- 1.resolve.dependencies.cmd | 6 +++--- 3.build.all.cmd | 4 ++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45580e6..6512b55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Install Conan - run: pip3 install conan + run: pip3 install conan 2.0.14 - name: Conan version run: conan --version @@ -23,6 +23,20 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Cache conan database + id: cache-conan + uses: actions/cache@v3 + env: + cache-name: cache-conan-database + with: + path: ~/.conan2 + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/conanfile.py') }} + + - if: ${{ steps.cache-conan.outputs.cache-hit != 'true' }} + name: List the state of conan local cache + continue-on-error: true + run: conan list * + - name: Resolve dependencies run: .\1.resolve.dependencies.cmd diff --git a/1.resolve.dependencies.cmd b/1.resolve.dependencies.cmd index 40a3c65..c4d2da6 100644 --- a/1.resolve.dependencies.cmd +++ b/1.resolve.dependencies.cmd @@ -1,12 +1,12 @@ -::conan install . --output-folder=build/conan --build=missing +conan install . --output-folder=build/conan --build=missing conan profile detect --force set CUR_DIR=%CD% -::conan install . --output-folder=%CUR_DIR%\build\conan --build=missing -s build_type=RelWithDebInfo -::if %errorlevel% neq 0 exit /b %errorlevel% +conan install . --output-folder=%CUR_DIR%\build\conan --build=missing -s build_type=RelWithDebInfo +if %errorlevel% neq 0 exit /b %errorlevel% conan install . --output-folder=%CUR_DIR%\build\conan --build=missing -s build_type=Debug if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/3.build.all.cmd b/3.build.all.cmd index 0e6589b..bc0ba58 100644 --- a/3.build.all.cmd +++ b/3.build.all.cmd @@ -2,5 +2,5 @@ cmake --build .\build --config "Debug" if %errorlevel% neq 0 exit /b %errorlevel% -::cmake --build .\build --config "RelWithDebInfo" -::if %errorlevel% neq 0 exit /b %errorlevel% +cmake --build .\build --config "RelWithDebInfo" +if %errorlevel% neq 0 exit /b %errorlevel% From 018fc57202227a31cf68e86ce92ad227f754ea83 Mon Sep 17 00:00:00 2001 From: Roman Ukhov Date: Mon, 29 Jan 2024 13:04:52 +0200 Subject: [PATCH 10/12] conan version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6512b55..27ec318 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Install Conan - run: pip3 install conan 2.0.14 + run: pip3 install conan 2.0 - name: Conan version run: conan --version From f8b3434afaf42fea0bd8dac27af371e80c5147cc Mon Sep 17 00:00:00 2001 From: Roman Ukhov Date: Mon, 29 Jan 2024 13:08:36 +0200 Subject: [PATCH 11/12] version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27ec318..2ab1d1a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Install Conan - run: pip3 install conan 2.0 + run: pip3 install 'conan>=2.0.0' - name: Conan version run: conan --version From d469ac8f59a6b28e6a7897f5195ee7d653a26e15 Mon Sep 17 00:00:00 2001 From: Roman Ukhov Date: Mon, 29 Jan 2024 13:48:29 +0200 Subject: [PATCH 12/12] update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1096b8..284e822 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# github-actions \ No newline at end of file +# github-actions