Skip to content

Commit 26220d0

Browse files
committed
Update dependencies
1 parent 7a16a20 commit 26220d0

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ jobs:
9898
if: matrix.pm == 'vcpkg'
9999
uses: friendlyanon/setup-vcpkg@v1
100100
with:
101-
committish: "eba7c6a894fce24146af4fdf161fef8e90dd6be3"
102-
cache-version: "1"
101+
committish: "d7112d1a4fb50410d3639f5f586972591d848beb"
102+
cache-version: "2"
103103
ignore-reserve-cache-error: true
104104

105105
- name: Configure

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: "eba7c6a894fce24146af4fdf161fef8e90dd6be3"{% end %}
13+
VCPKG_COMMIT: "d7112d1a4fb50410d3639f5f586972591d848beb"{% 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
@@ -10,9 +10,9 @@ def layout(self):
1010

1111
def requirements(self):{% if c %}{% if exe %}
1212
self.requires("hedley/15"){% end %}
13-
self.requires("json-c/0.17"){% else %}
13+
self.requires("json-c/0.18"){% else %}
1414
self.requires("fmt/11.0.2"){% end %}
1515

1616
def build_requirements(self):{% if catch3 %}
17-
self.test_requires("catch2/3.7.0"){% else %}
17+
self.test_requires("catch2/3.7.1"){% else %}
1818
self.test_requires("catch2/2.13.10", options={"with_main": True}){% 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 %}2023-08-12{% else %}11.0.2{% end %}"
7+
"version>=": "{% if c %}2023-08-12{% else %}11.0.2#1{% end %}"
88
}{% if c and exe %},
99
{
1010
"name": "hedley",
@@ -18,13 +18,13 @@
1818
"dependencies": [
1919
{% if catch3 %}{
2020
"name": "catch2",
21-
"version>=": "3.7.0"
21+
"version>=": "3.7.1"
2222
}{% else %}"catch2"{% end %}
2323
]
2424
}
2525
},{% if not catch3 %}
2626
"overrides": [
2727
{ "name": "catch2", "version": "2.13.9#1" }
2828
],{% end %}
29-
"builtin-baseline": "eba7c6a894fce24146af4fdf161fef8e90dd6be3"
29+
"builtin-baseline": "d7112d1a4fb50410d3639f5f586972591d848beb"
3030
}

0 commit comments

Comments
 (0)