From 81f66eec0c59d9d1270f571202c4e32a1fb0a7b4 Mon Sep 17 00:00:00 2001 From: Kyle Kienapfel Date: Mon, 25 Jul 2022 15:56:10 -0700 Subject: build: Ship vcpkg dlls with MSVC pr-verify builds With our recent switchover from conan to vcpkg, we're shipping a few more dll files, these need to be in the full zip. cp .\build\bin\*.dll .\artifacts\ also tacking on the fix where we're shipping scm_rev.cpp accidentally --- .ci/scripts/windows/upload.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.ci/scripts/windows/upload.ps1 b/.ci/scripts/windows/upload.ps1 index ac2a38f1d..3bb0c5fe5 100644 --- a/.ci/scripts/windows/upload.ps1 +++ b/.ci/scripts/windows/upload.ps1 @@ -54,6 +54,10 @@ Copy-Item .\CMakeModules -Recurse -Destination $MSVC_SOURCE if ("$env:GITHUB_ACTIONS" -eq "true") { echo "Hello GitHub Actions" + # With vcpkg we now have a few more dll files + ls .\build\bin\*.dll + cp .\build\bin\*.dll .\artifacts\ + # Hopefully there is an exe in either .\build\bin or .\build\bin\Release cp .\build\bin\yuzu*.exe .\artifacts\ Copy-Item "$BUILD_DIR\*" -Destination "artifacts" -Recurse @@ -109,6 +113,3 @@ Get-ChildItem . -Filter "*.zip" | Copy-Item -destination "artifacts" Get-ChildItem . -Filter "*.7z" | Copy-Item -destination "artifacts" Get-ChildItem . -Filter "*.tar.xz" | Copy-Item -destination "artifacts" } -# Extra items -git status -cp .\build\src\common\scm_rev.cpp .\artifacts -- cgit v1.2.3