Skip to content

Commit dd8de19

Browse files
committed
Update Conan and vcpkg dependencies
1 parent 904f03f commit dd8de19

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
if: matrix.pm == 'vcpkg'
110110
uses: friendlyanon/setup-vcpkg@v1
111111
with:
112-
committish: "62d01b70df227850b728f5050418b917ad6d2b32"
112+
committish: "d40547583e959e3e25b3dc5b5adc52cabe5face9"
113113
cache-version: "1"
114114
ignore-reserve-cache-error: true
115115

cmake-init/templates/common/.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- master{% if vcpkg %}
1111

1212
env:
13-
VCPKG_COMMIT: "62d01b70df227850b728f5050418b917ad6d2b32"{% end %}
13+
VCPKG_COMMIT: "d40547583e959e3e25b3dc5b5adc52cabe5face9"{% end %}
1414

1515
jobs:
1616
lint:

cmake-init/templates/common/conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ def layout(self):
1313

1414
def requirements(self):{% if c %}{% if exe %}
1515
self.requires("hedley/15"){% end %}
16-
self.requires("json-c/0.15"){% else %}
16+
self.requires("json-c/0.16"){% else %}
1717
self.requires("fmt/9.1.0"){% end %}
1818

1919
def build_requirements(self):{% if catch3 %}
20-
self.test_requires("catch2/3.1.0"){% else %}
20+
self.test_requires("catch2/3.2.1"){% else %}
2121
self.test_requires("catch2/2.13.9"){% end %}

cmake-init/templates/common/vcpkg.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"dependencies": [
55
{
66
"name": "{% if c %}json-c{% else %}fmt{% end %}",
7-
"version>=": "{% if c %}2022-06-26{% else %}9.1.0{% end %}"
7+
"version>=": "{% if c %}2022-06-26#2{% else %}9.1.0#1{% end %}"
88
}{% if c and exe %},
99
{
1010
"name": "hedley",
@@ -18,13 +18,13 @@
1818
"dependencies": [
1919
{
2020
"name": "catch2",
21-
"version>=": {% if catch3 %}"3.1.1#1"{% else %}"2.13.9#1"{% end %}
21+
"version>=": {% if catch3 %}"3.2.1"{% else %}"2.13.9#1"{% end %}
2222
}
2323
]
2424
}
2525
},{% if not catch3 %}
2626
"overrides": [
2727
{ "name": "catch2", "version": "2.13.9#1" }
2828
],{% end %}
29-
"builtin-baseline": "62d01b70df227850b728f5050418b917ad6d2b32"
29+
"builtin-baseline": "d40547583e959e3e25b3dc5b5adc52cabe5face9"
3030
}

0 commit comments

Comments
 (0)