Skip to content

Commit 415fa59

Browse files
Bump cmake/conan defaults; fix Renovate regex that could never see them (#134)
Renovate's cmake-version/conan-version customManager regex only matched the single-line 'key: value' shape used by callers (cmake-version: 3.24.0). This repo's own workflow_call.inputs define defaults two keys deep (cmake-version: / type: string / default: 3.24.0), a shape the regex could never match -- so these defaults silently never got bumped while the same key got bumped constantly in every downstream caller. Added a second matchStrings pattern for the definer shape. Also bumps the stale defaults now: cmake-version 3.24.0/3.21.7 -> 4.4.2 (matching the already-fixed lukka/get-cmake@v4.4.2 pin -- same drift class fixed elsewhere this session), conan-version 2.3.0/2.23.0 -> 2.31.2 (latest on PyPI, matching what downstream repos already override to). Also includes workflow name-collision fixes (Release -> Publish Release, Conan packaging -> Conan Packaging) to avoid ambiguity with the new Release workflow.
1 parent 76d4057 commit 415fa59

4 files changed

Lines changed: 12 additions & 10 deletions

File tree

.github/workflows/abi-diff.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ on:
1313
default: clang++-20
1414
cmake-version:
1515
type: string
16-
default: 3.21.7
16+
default: 4.4.2
1717
conan-version:
1818
type: string
19-
default: 2.23.0
19+
default: 2.31.2
2020
setup_tools:
2121
type: boolean
2222
default: false

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Conan packaging
1+
name: Conan Packaging
22

33
on:
44
workflow_call:
@@ -15,10 +15,10 @@ on:
1515
default: clang-17
1616
cmake-version:
1717
type: string
18-
default: 3.24.0
18+
default: 4.4.2
1919
conan-version:
2020
type: string
21-
default: 2.3.0
21+
default: 2.31.2
2222
conan-options:
2323
type: string
2424
secrets:

.github/workflows/publish-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Release
1+
name: Publish Release
22

33
on:
44
workflow_call:
@@ -15,10 +15,10 @@ on:
1515
default: clang-17
1616
cmake-version:
1717
type: string
18-
default: 3.24.0
18+
default: 4.4.2
1919
conan-version:
2020
type: string
21-
default: 2.3.0
21+
default: 2.31.2
2222
conan-options:
2323
type: string
2424
use-tag: # if true an existing tag/release is update; otherwise the job fails. If true the job will also fail if the tag doesn't match the version reported via conan.

renovate.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"/^\\.github/.*\\.ya?ml$/"
2525
],
2626
"matchStrings": [
27-
"conan-version:\\s*[\"']?(?<currentValue>\\d+\\.\\d+\\.\\d+)[\"']?"
27+
"conan-version:\\s*[\"']?(?<currentValue>\\d+\\.\\d+\\.\\d+)[\"']?",
28+
"conan-version:\\s*\\n\\s*type:\\s*string\\s*\\n\\s*default:\\s*[\"']?(?<currentValue>\\d+\\.\\d+\\.\\d+)[\"']?"
2829
],
2930
"datasourceTemplate": "pypi",
3031
"depNameTemplate": "conan"
@@ -35,7 +36,8 @@
3536
"/^\\.github/.*\\.ya?ml$/"
3637
],
3738
"matchStrings": [
38-
"cmake-version:\\s*[\"']?(?<currentValue>\\d+\\.\\d+\\.\\d+)[\"']?"
39+
"cmake-version:\\s*[\"']?(?<currentValue>\\d+\\.\\d+\\.\\d+)[\"']?",
40+
"cmake-version:\\s*\\n\\s*type:\\s*string\\s*\\n\\s*default:\\s*[\"']?(?<currentValue>\\d+\\.\\d+\\.\\d+)[\"']?"
3941
],
4042
"datasourceTemplate": "github-releases",
4143
"depNameTemplate": "Kitware/CMake",

0 commit comments

Comments
 (0)