Skip to content

Commit 1e3c5ae

Browse files
Bump reusable-workflow pin to v2.1.1; remove cmake/conan overrides
v2.1.1 fixes both gaps that made removing these unsafe before: cmake-version default is now 4.4.2 (matching lukka/get-cmake@v4.4.2), and configure_conan's own conan-version default is now 2.31.2 (previously a stale 2.3.1 that broke clang-19+ builds). Both overrides now exactly duplicate the reusable workflow's own defaults.
1 parent bb2fe88 commit 1e3c5ae

4 files changed

Lines changed: 6 additions & 14 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
steps:
3131
# setup env
3232
- name: Add repos for for gcc-13 and clang-16
33-
uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/setup_apt@v2.1.0
33+
uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/setup_apt@v2.1.1
3434

3535
- name: Install tools
3636
run: |
@@ -51,9 +51,7 @@ jobs:
5151
uses: rui314/setup-mold@v1
5252

5353
- name: Configure conan
54-
uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/configure_conan@v2.1.0
55-
with:
56-
conan-version: 2.31.2
54+
uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/configure_conan@v2.1.1
5755

5856
- name: add conan user
5957
run: |
@@ -70,7 +68,7 @@ jobs:
7068
uses: actions/checkout@v7
7169

7270
- name: Get dependency provider
73-
uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/add_conan_provider@v2.1.0
71+
uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/add_conan_provider@v2.1.1
7472

7573
- name: Configure CMake
7674
env:

‎.github/workflows/detect-pobr-diff.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ concurrency:
88

99
jobs:
1010
detect-pobr-diff:
11-
uses: dice-group/cpp-conan-release-reusable-workflow/.github/workflows/abi-diff.yml@v2.1.0
11+
uses: dice-group/cpp-conan-release-reusable-workflow/.github/workflows/abi-diff.yml@v2.1.1
1212
with:
1313
os: ubuntu-24.04
1414
setup_tools: true
1515
cc: clang-19
1616
cxx: clang++-19
17-
cmake-version: 4.4.2
18-
conan-version: 2.31.2
1917
base-branch: ${{ github.base_ref }}
2018
search-path: >
2119
include/dice/sparse-map/sparse_growth_policy.hpp

‎.github/workflows/publish-conan-branch-package.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ concurrency:
88

99
jobs:
1010
publish-conan-branch-package:
11-
uses: dice-group/cpp-conan-release-reusable-workflow/.github/workflows/publish-conan-branch-package.yml@v2.1.0
11+
uses: dice-group/cpp-conan-release-reusable-workflow/.github/workflows/publish-conan-branch-package.yml@v2.1.1
1212
with:
1313
public_artifactory: true
1414
os: ubuntu-24.04
1515
compiler: clang-19
16-
cmake-version: 4.4.2
17-
conan-version: 2.31.2
1816
secrets:
1917
CONAN_CICD_USERNAME: ${{ secrets.CONAN_CICD_USERNAME }}
2018
CONAN_CICD_PASSWORD: ${{ secrets.CONAN_CICD_PASSWORD }}

‎.github/workflows/publish-release.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ concurrency:
1313

1414
jobs:
1515
publish-release:
16-
uses: dice-group/cpp-conan-release-reusable-workflow/.github/workflows/publish-release.yml@v2.1.0
16+
uses: dice-group/cpp-conan-release-reusable-workflow/.github/workflows/publish-release.yml@v2.1.1
1717
with:
1818
public_artifactory: true
1919
os: ubuntu-24.04
2020
compiler: clang-19
21-
cmake-version: 4.4.2
22-
conan-version: 2.31.2
2321
secrets:
2422
CONAN_CICD_USERNAME: ${{ secrets.CONAN_CICD_USERNAME }}
2523
CONAN_CICD_PASSWORD: ${{ secrets.CONAN_CICD_PASSWORD }}

0 commit comments

Comments
 (0)