Skip to content

Commit

Permalink
Merge pull request #730 from openziti/vcpkg-cache
Browse files Browse the repository at this point in the history
Vcpkg cache
  • Loading branch information
ekoby committed Sep 18, 2024
2 parents 929fc24 + 4eae7ba commit cf9f926
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ runs:

- uses: lukka/run-vcpkg@v11

- uses: actions/cache@v4
with:
key: deps-${{ inputs.target }}-${{ hashFiles('./vcpkg.json') }}
path: './vcpkg/packages'

- uses: lukka/run-cmake@v10
name: Configure CMake
with:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: C/C++ CI

on:
workflow_dispatch:
push:
branches:
- main
pull_request:
branches:
- main
Expand Down
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"hidden": true,
"cacheVariables": {
"ziti_DEVELOPER_MODE": "ON",
"VCPKG_MANIFEST_FEATURES": "test;samples"
"VCPKG_MANIFEST_FEATURES": "dev-features"
}
},
{
Expand Down
9 changes: 9 additions & 0 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@
"name": "cli11"
}
]
},
"dev-features": {
"description": "features for development",
"dependencies": [
{
"name": "ziti",
"features": [ "test", "samples" ]
}
]
}
},
"builtin-baseline": "1de2026f28ead93ff1773e6e680387643e914ea1"
Expand Down

0 comments on commit cf9f926

Please sign in to comment.