Skip to content

Commit

Permalink
Print vcpkg_abi_info.txt contents.
Browse files Browse the repository at this point in the history
The only suggestion that came up was checking to see if something in this file changed between when the vcpkg cache is used vs isn't used, so... print out the contents of a random dependency and then check back later I guess.
  • Loading branch information
Pentarctagon committed Jul 9, 2022
1 parent 353ff1a commit 10e40aa
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ jobs:
path: |
D:/a/wesnoth/vcpkg
D:/a/wesnoth/wesnoth/vcpkg_installed
key: win-cache-0002
key: win-cache-0005

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
Expand All @@ -234,7 +234,6 @@ jobs:
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" git checkout b49b2bdf22559c89eddbf29a29621a1dc6929320
if not exist "D:/a/wesnoth/vcpkg" D:/a/wesnoth/vcpkg/bootstrap-vcpkg.bat
- name: Setup cmake
Expand Down Expand Up @@ -277,7 +276,7 @@ jobs:
path: |
D:/a/wesnoth/vcpkg
D:/a/wesnoth/wesnoth/vcpkg_installed
key: win-cache-0002
key: win-cache-0005

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
Expand All @@ -287,7 +286,6 @@ jobs:
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" git checkout b49b2bdf22559c89eddbf29a29621a1dc6929320
if not exist "D:/a/wesnoth/vcpkg" D:/a/wesnoth/vcpkg/bootstrap-vcpkg.bat
- name: Setup cmake
Expand All @@ -299,13 +297,14 @@ jobs:
run: |
cmake -DCMAKE_BUILD_TYPE=Release -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" .
# 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
- name: vcpkg_abi_info
shell: cmd
run: |
type "D:\a\wesnoth\vcpkg\buildtrees\bzip2\x64-windows.vcpkg_abi_info.txt"
- name: Build wesnoth
shell: cmd
run: |
rmdir /s /q D:\a\wesnoth\vcpkg\buildtrees
MSBuild.exe wesnoth.sln -p:Configuration=Release
- name: Run WML unit tests
Expand Down

0 comments on commit 10e40aa

Please sign in to comment.