From 158901ff0259b5033ff9501db99b3ca03022b63a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Kapu=C5=9Bci=C5=84ski?= Date: Mon, 10 Apr 2023 22:36:52 +0200 Subject: [PATCH] Fixed cached path --- .github/workflows/build.yml | 2 +- vcpkg.json | 46 ++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 337d639d..0f597890 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -139,7 +139,7 @@ jobs: vcpkgTriplet: ${{ matrix.vcpkg_triplet }} # SHA-256 hash of the vcpkg.json file, recalculated automatically when it changes appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }} - additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed + additionalCachedPaths: ${{ github.workspace }}/build/vcpkg_installed - name: Install external tools working-directory: ${{ github.workspace }} run: | diff --git a/vcpkg.json b/vcpkg.json index 673c5935..ab33b4cf 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,15 +3,32 @@ "version-string": "0.1.0", "builtin-baseline": "e809a42f87565e803b2178a0c11263f462d1800a", "dependencies": [ - "boost-system", - "boost-filesystem", - "boost-regex", - "boost-lexical-cast", - "boost-bimap", "boost-algorithm", - "boost-property-tree", + "boost-bimap", + "boost-filesystem", + "boost-lexical-cast", "boost-optional", + "boost-property-tree", "boost-range", + "boost-regex", + "boost-system", + { + "name": "freetype", + "default-features": false + }, + "glew", + "gettext", + "libogg", + "libpng", + { + "name": "libsndfile", + "default-features": false, + "features": [ "external-libs" ] + }, + "libvorbis", + "openal-soft", + "opus", + "physfs", "sdl2", { "name": "sdl2-image", @@ -21,23 +38,6 @@ "name": "sdl2-ttf", "default-features": false }, - "glew", - "libpng", - "gettext", - { - "name": "libsndfile", - "default-features": false, - "features": [ "external-libs" ] - }, - { - "name": "freetype", - "default-features": false - }, - "libvorbis", - "libogg", - "opus", - "openal-soft", - "physfs", "zlib" ], "overrides": [