summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Kyle Kienapfel2022-07-25 15:56:10 -0700
committerGravatar Kyle Kienapfel2022-07-26 22:57:23 -0700
commit81f66eec0c59d9d1270f571202c4e32a1fb0a7b4 (patch)
tree3fd631477b833948b67e8b8675523fa44fe58a34
parentMerge pull request #8545 from Kelebek1/Audio (diff)
downloadyuzu-81f66eec0c59d9d1270f571202c4e32a1fb0a7b4.tar.gz
yuzu-81f66eec0c59d9d1270f571202c4e32a1fb0a7b4.tar.xz
yuzu-81f66eec0c59d9d1270f571202c4e32a1fb0a7b4.zip
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
-rw-r--r--.ci/scripts/windows/upload.ps17
1 files 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
54if ("$env:GITHUB_ACTIONS" -eq "true") { 54if ("$env:GITHUB_ACTIONS" -eq "true") {
55 echo "Hello GitHub Actions" 55 echo "Hello GitHub Actions"
56 56
57 # With vcpkg we now have a few more dll files
58 ls .\build\bin\*.dll
59 cp .\build\bin\*.dll .\artifacts\
60
57 # Hopefully there is an exe in either .\build\bin or .\build\bin\Release 61 # Hopefully there is an exe in either .\build\bin or .\build\bin\Release
58 cp .\build\bin\yuzu*.exe .\artifacts\ 62 cp .\build\bin\yuzu*.exe .\artifacts\
59 Copy-Item "$BUILD_DIR\*" -Destination "artifacts" -Recurse 63 Copy-Item "$BUILD_DIR\*" -Destination "artifacts" -Recurse
@@ -109,6 +113,3 @@ Get-ChildItem . -Filter "*.zip" | Copy-Item -destination "artifacts"
109Get-ChildItem . -Filter "*.7z" | Copy-Item -destination "artifacts" 113Get-ChildItem . -Filter "*.7z" | Copy-Item -destination "artifacts"
110Get-ChildItem . -Filter "*.tar.xz" | Copy-Item -destination "artifacts" 114Get-ChildItem . -Filter "*.tar.xz" | Copy-Item -destination "artifacts"
111} 115}
112# Extra items
113git status
114cp .\build\src\common\scm_rev.cpp .\artifacts