Skip to content

Commit 5f67a27

Browse files
bump conan from 1.66 to 2.11
1 parent b98484a commit 5f67a27

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

.github/workflows/buildAndTest.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ jobs:
1818
BUILD_TYPE: Debug
1919
- CONAN_BUILD_TYPE: Release
2020
BUILD_TYPE: RelWithDebInfo
21+
- os: ubuntu-22.04
22+
conanruncmd: source conanrun.sh
23+
- os: windows-2019
24+
conanruncmd: .\conanrun.bat
2125

2226
runs-on: ${{matrix.os}}
2327
steps:
@@ -27,23 +31,18 @@ jobs:
2731
id: conan
2832
uses: turtlebrowser/get-conan@main
2933
with:
30-
version: 1.66.0
34+
version: 2.11.0
3135

3236
- name: Detect Conan Profile
33-
run: conan profile new default --detect
34-
35-
- name: Fix libcxx setting
36-
run: conan profile update settings.compiler.libcxx=libstdc++11 default
37-
if: matrix.os == 'ubuntu-22.04'
38-
37+
run: conan profile detect
38+
3939
- name: Install Dependencies
40-
run: conan install --install-folder ${{github.workspace}}/build -s build_type=${{matrix.CONAN_BUILD_TYPE}} -o sqlite3:shared=True .
41-
#run: conan install --install-folder ${{github.workspace}}/build -s build_type=${{matrix.CONAN_BUILD_TYPE}} .
40+
# "&:build_type=..." specifies the consumer packages build type, see https://github.com/conan-io/conan/issues/16852
41+
run: conan install . --output-folder ${{github.workspace}}/build -s build_type=${{matrix.CONAN_BUILD_TYPE}} -s "&:build_type=${{matrix.BUILD_TYPE}}" -o "sqlite3/*:shared=True" --build=missing
4242

4343
- name: Configure CMake
44-
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
45-
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
46-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} -DBUILD_SHARED_LIBS=True
44+
# Configure CMake in a 'build' subdirectory.
45+
run: cmake --preset conan-default -DBUILD_SHARED_LIBS=ON .
4746

4847
- name: Build
4948
# Build your program with the given configuration
@@ -53,7 +52,7 @@ jobs:
5352
working-directory: ${{github.workspace}}/build
5453
# Execute tests defined by the CMake configuration.
5554
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
56-
run: ctest -C ${{matrix.BUILD_TYPE}} --output-on-failure
55+
run: ${{matrix.conanruncmd}} && ctest -C ${{matrix.BUILD_TYPE}} --output-on-failure
5756

5857
- name: CPack
5958
if: ${{ github.event_name == 'release' }}

conanfile.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@ sqlite3/3.47.0
33
gtest/1.15.0
44
fmt/11.0.0
55
[generators]
6-
cmake_find_package
7-
8-
[imports]
9-
bin, *.dll -> . # Copies all dll files from packages bin folder to build folder
6+
CMakeDeps
7+
CMakeToolchain

0 commit comments

Comments
 (0)