Skip to content

Commit ce93659

Browse files
committed
Disable conan v1 and build cppstd from profile
1 parent 00bb5d6 commit ce93659

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

.github/workflows/ci-conan-clang.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ jobs:
1616
env:
1717
USER_CHANNEL: "${{ matrix.conan == '1.0' && 'sintef/stable' || '--user sintef --channel stable' }}"
1818
UPLOAD_FLAGS: "${{ matrix.conan == '1.0' && '--all' || '' }}"
19-
cppstd: "${{ matrix.compiler_version < 15 && 'gnu14' || 'gnu17' }}"
2019
strategy:
2120
fail-fast: false
2221
matrix:
23-
conan: ["1.0", "2.0"]
22+
conan: ["2.0"]
2423
profile: [clang]
2524
compiler_version: [11, 12, 13, 14]
2625
build_type: [Debug, Release]
@@ -50,7 +49,6 @@ jobs:
5049
conan config install ${{ env.CONFIG_URL }} --type git -sf profiles -tf profiles
5150
conan create -s build_type=${{ matrix.build_type }} \
5251
-s compiler.version=${{ matrix.compiler_version }} \
53-
-s compiler.cppstd=${{ env.cppstd }} \
5452
-pr:b=${{ matrix.profile }} -pr:h=${{ matrix.profile }} \
5553
-b missing -b outdated -b ${{ env.package_name }}* \
5654
. ${{ env.USER_CHANNEL }}

.github/workflows/ci-conan-gcc.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ jobs:
1616
env:
1717
USER_CHANNEL: "${{ matrix.conan == '1.0' && 'sintef/stable' || '--user sintef --channel stable' }}"
1818
UPLOAD_FLAGS: "${{ matrix.conan == '1.0' && '--all' || '' }}"
19-
cppstd: "${{ matrix.compiler_version < 11 && 'gnu14' || 'gnu17' }}"
2019
strategy:
2120
fail-fast: false
2221
matrix:
23-
conan: ["1.0", "2.0"]
22+
conan: ["2.0"]
2423
profile: [gcc]
2524
compiler_version: [8, 9, 10, 11, 12]
2625
build_type: [Debug, Release]
@@ -50,7 +49,6 @@ jobs:
5049
conan config install ${{ env.CONFIG_URL }} --type git -sf profiles -tf profiles
5150
conan create -s build_type=${{ matrix.build_type }} \
5251
-s compiler.version=${{ matrix.compiler_version }} \
53-
-s compiler.cppstd=${{ env.cppstd }} \
5452
-pr:b=${{ matrix.profile }} -pr:h=${{ matrix.profile }} \
5553
-b missing -b outdated -b ${{ env.package_name }}* \
5654
-o boost/*:extra_b2_flags=define=BOOST_FILESYSTEM_DISABLE_STATX \

.github/workflows/ci-conan-msvc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
conan: ["1.0", "2.0"]
22+
conan: ["2.0"]
2323
profile: [msvc17]
2424
compiler_version: [191, 192, 193]
2525
build_type: [Debug, Release]

0 commit comments

Comments
 (0)