See if this gets vcpkg caching working.
This commit is contained in:
parent
9d5266d624
commit
e85b64c6f0
2 changed files with 8 additions and 7 deletions
11
.github/workflows/ci-main.yml
vendored
11
.github/workflows/ci-main.yml
vendored
|
@ -267,16 +267,16 @@ jobs:
|
|||
path: |
|
||||
D:/a/wesnoth/vcpkg
|
||||
D:/a/wesnoth/wesnoth/vcpkg_installed
|
||||
key: win-cache-0006
|
||||
key: win-cache-0007
|
||||
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v1.0.2
|
||||
|
||||
- name: Build vcpkg
|
||||
run: |
|
||||
if not exist "D:/a/wesnoth/vcpkg" git clone https://github.com/microsoft/vcpkg.git D:/a/wesnoth/vcpkg
|
||||
if not exist "D:/a/wesnoth/vcpkg" cd D:/a/wesnoth/vcpkg
|
||||
if not exist "D:/a/wesnoth/vcpkg" D:/a/wesnoth/vcpkg/bootstrap-vcpkg.bat
|
||||
"D:/a/wesnoth/vcpkg" git clone https://github.com/microsoft/vcpkg.git D:/a/wesnoth/vcpkg
|
||||
"D:/a/wesnoth/vcpkg" cd D:/a/wesnoth/vcpkg
|
||||
"D:/a/wesnoth/vcpkg" D:/a/wesnoth/vcpkg/bootstrap-vcpkg.bat
|
||||
|
||||
- name: Setup cmake
|
||||
uses: jwlawson/actions-setup-cmake@v1.9
|
||||
|
@ -287,9 +287,6 @@ jobs:
|
|||
run: |
|
||||
cmake -DCMAKE_BUILD_TYPE=%CFG% -DENABLE_GAME=true -DENABLE_SERVER=true -DENABLE_CAMPAIGN_SERVER=true -DENABLE_TESTS=true -DENABLE_MYSQL=false -DENABLE_NLS=false -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_TOOLCHAIN_FILE=D:/a/wesnoth/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_GENERATOR_PLATFORM=x64 -G "Visual Studio 16 2019" .
|
||||
|
||||
- name: vcpkg_abi_info
|
||||
run: type "D:\a\wesnoth\vcpkg\buildtrees\bzip2\x64-windows.vcpkg_abi_info.txt"
|
||||
|
||||
# delete buildtrees directory to free up space after cmake invokes vcpkg to build the dependencies
|
||||
# otherwise the job was failing when trying to write a .obj file
|
||||
# building vcpkg on the more spacious C drive didn't work since for some reason vcpkg decides to not create the pango/cairo pkgconfig files there
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
|
||||
"name": "wesnoth-dependencies",
|
||||
"version": "0.0.1",
|
||||
"default-registry": {
|
||||
"kind": "builtin",
|
||||
"baseline": "96c35a683eed6695172ebe30d752654d9c0658e6"
|
||||
},
|
||||
"dependencies": [
|
||||
"sdl2",
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue