Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
friendlyanon committed Sep 9, 2024
1 parent e3c89a1 commit 3a4d395
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
if: matrix.pm == 'vcpkg'
uses: friendlyanon/setup-vcpkg@v1
with:
committish: "ad25766aefb5313b6bc4e2a4b78a2946f84fbf66"
committish: "eba7c6a894fce24146af4fdf161fef8e90dd6be3"
cache-version: "1"
ignore-reserve-cache-error: true

Expand Down
2 changes: 1 addition & 1 deletion cmake-init/templates/common/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- master{% if vcpkg %}

env:
VCPKG_COMMIT: "ad25766aefb5313b6bc4e2a4b78a2946f84fbf66"{% end %}
VCPKG_COMMIT: "eba7c6a894fce24146af4fdf161fef8e90dd6be3"{% end %}

jobs:
lint:
Expand Down
4 changes: 2 additions & 2 deletions cmake-init/templates/common/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ def layout(self):
def requirements(self):{% if c %}{% if exe %}
self.requires("hedley/15"){% end %}
self.requires("json-c/0.17"){% else %}
self.requires("fmt/10.2.1"){% end %}
self.requires("fmt/11.0.2"){% end %}

def build_requirements(self):{% if catch3 %}
self.test_requires("catch2/3.6.0"){% else %}
self.test_requires("catch2/3.7.0"){% else %}
self.test_requires("catch2/2.13.10", options={"with_main": True}){% end %}
6 changes: 3 additions & 3 deletions cmake-init/templates/common/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"dependencies": [
{
"name": "{% if c %}json-c{% else %}fmt{% end %}",
"version>=": "{% if c %}2023-08-12{% else %}10.2.1#2{% end %}"
"version>=": "{% if c %}2023-08-12{% else %}11.0.2{% end %}"
}{% if c and exe %},
{
"name": "hedley",
Expand All @@ -18,13 +18,13 @@
"dependencies": [
{% if catch3 %}{
"name": "catch2",
"version>=": "3.6.0"
"version>=": "3.7.0"
}{% else %}"catch2"{% end %}
]
}
},{% if not catch3 %}
"overrides": [
{ "name": "catch2", "version": "2.13.9#1" }
],{% end %}
"builtin-baseline": "ad25766aefb5313b6bc4e2a4b78a2946f84fbf66"
"builtin-baseline": "eba7c6a894fce24146af4fdf161fef8e90dd6be3"
}

0 comments on commit 3a4d395

Please sign in to comment.