diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index b518773f..aa70f6f6 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -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: diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ade3aed4..ec3057a5 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -2,6 +2,9 @@ name: C/C++ CI on: workflow_dispatch: + push: + branches: + - main pull_request: branches: - main diff --git a/CMakePresets.json b/CMakePresets.json index 2fc56eda..5b2325ca 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -11,7 +11,7 @@ "hidden": true, "cacheVariables": { "ziti_DEVELOPER_MODE": "ON", - "VCPKG_MANIFEST_FEATURES": "test;samples" + "VCPKG_MANIFEST_FEATURES": "dev-features" } }, { diff --git a/vcpkg.json b/vcpkg.json index 9c0674fd..88094018 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -31,6 +31,15 @@ "name": "cli11" } ] + }, + "dev-features": { + "description": "features for development", + "dependencies": [ + { + "name": "ziti", + "features": [ "test", "samples" ] + } + ] } }, "builtin-baseline": "1de2026f28ead93ff1773e6e680387643e914ea1"