Skip to content

Commit 2db6a80

Browse files
bump conan from 1.66 to 2.11
1 parent b98484a commit 2db6a80

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

.github/workflows/buildAndTest.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,19 @@ jobs:
1111
build:
1212
strategy:
1313
matrix:
14-
os: [ubuntu-22.04, windows-2019]
15-
BUILD_TYPE: [RelWithDebInfo, Debug]
14+
#os: [ubuntu-22.04, windows-2022]
15+
os: [windows-2022]
16+
#BUILD_TYPE: [RelWithDebInfo, Debug]
17+
BUILD_TYPE: [RelWithDebInfo]
1618
include:
17-
- CONAN_BUILD_TYPE: Debug
18-
BUILD_TYPE: Debug
19+
# - CONAN_BUILD_TYPE: Debug
20+
# BUILD_TYPE: Debug
1921
- CONAN_BUILD_TYPE: Release
2022
BUILD_TYPE: RelWithDebInfo
23+
# - os: ubuntu-22.04
24+
# conanruncmd: source conanrun.sh
25+
- os: windows-2022
26+
conanruncmd: .\conanrun.bat
2127

2228
runs-on: ${{matrix.os}}
2329
steps:
@@ -27,23 +33,18 @@ jobs:
2733
id: conan
2834
uses: turtlebrowser/get-conan@main
2935
with:
30-
version: 1.66.0
36+
version: 2.11.0
3137

3238
- 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-
39+
run: conan profile detect
40+
3941
- 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}} .
42+
# "&:build_type=..." specifies the consumer packages build type, see https://github.com/conan-io/conan/issues/16852
43+
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
4244

4345
- 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
46+
# Configure CMake in a 'build' subdirectory.
47+
run: cmake --preset conan-default . -DBUILD_SHARED_LIBS=ON
4748

4849
- name: Build
4950
# Build your program with the given configuration
@@ -53,7 +54,7 @@ jobs:
5354
working-directory: ${{github.workspace}}/build
5455
# Execute tests defined by the CMake configuration.
5556
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
56-
run: ctest -C ${{matrix.BUILD_TYPE}} --output-on-failure
57+
run: ${{matrix.conanruncmd}} && ctest -C ${{matrix.BUILD_TYPE}} --output-on-failure
5758

5859
- name: CPack
5960
if: ${{ github.event_name == 'release' }}
@@ -77,7 +78,7 @@ jobs:
7778
if: ${{ github.event_name == 'release' }}
7879
strategy:
7980
matrix:
80-
artifact_os: [ubuntu-22.04, windows-2019]
81+
artifact_os: [ubuntu-22.04, windows-2022]
8182
artifact_build_type: [RelWithDebInfo, Debug]
8283
runs-on: ubuntu-22.04
8384
steps:

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)