From bf55acc1cb9cb822451042aa47e9a6af9dddd409 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Sat, 13 Jun 2020 17:36:38 +0200 Subject: [PATCH] [AppVeyor] Add support of vcpkg cache for CI Signed-off-by: Vitalii Koshura --- appveyor.yml | 4 +++- win_build/boinc.props | 4 +++- win_build/vcpkg_3rdparty_dependencies_2019.vcxproj | 8 +++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1bc24481a0..9d804abac5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -90,8 +90,9 @@ environment: APPVEYOR_CACHE_ENTRY_ZIP_ARGS: "-t7z -m0=lzma2 -mx=9 -ms=on" cache: - - C:\projects\boinc_depends_win_vs2013 -> appveyor.yml, win_build\load_dependencies.bat - C:\projects\boinc_depends_win_vs2010 -> appveyor.yml, win_build\load_dependencies.bat + - C:\projects\boinc_depends_win_vs2013 -> appveyor.yml, win_build\load_dependencies.bat + - C:\projects\boinc_depends_win_vs2019 -> appveyor.yml before_build: - if %TOOLCHAIN_VERSION%==10.0 call win_build\load_dependencies.bat %depends_zip_path% %depends_path% %platform% %configuration% @@ -108,6 +109,7 @@ build_script: after_build: - if %TOOLCHAIN_VERSION%==12.0 call deploy\prepare_deployment.bat - if %TOOLCHAIN_VERSION%==12.0 call deploy\deploy_to_bintray.bat + - if %TOOLCHAIN_VERSION%==16.0 call xcopy 3rdParty\Windows\vcpkg\installed ..\boinc_depends_win_vs2019 /e /i /y artifacts: - path: deploy\win-apps\*.7z diff --git a/win_build/boinc.props b/win_build/boinc.props index d00fb8eabc..4d201f2da6 100644 --- a/win_build/boinc.props +++ b/win_build/boinc.props @@ -6,6 +6,8 @@ $(VcpkgRootDir)\..\cuda\nvcc\include $(VcpkgRootDir)\..\cuda\nvcc\lib $(CUDA_BIN_PATH)\nvcc.exe - $(CUDA_BIN_PATH)\..\..\ + $(CUDA_BIN_PATH)\..\..\ + default + ../../boinc_depends_win_vs2019 \ No newline at end of file diff --git a/win_build/vcpkg_3rdparty_dependencies_2019.vcxproj b/win_build/vcpkg_3rdparty_dependencies_2019.vcxproj index f8ff5eca9c..f05429b5b1 100644 --- a/win_build/vcpkg_3rdparty_dependencies_2019.vcxproj +++ b/win_build/vcpkg_3rdparty_dependencies_2019.vcxproj @@ -15,7 +15,6 @@ 16.0 {D3E5B5B5-4FB1-4877-9B2C-6708B3D568F7} vcpkg3rdpartydependencies - default @@ -98,12 +97,15 @@ - + - + + + +