diff --git a/.travis.yml b/.travis.yml index 77adfea5..5f14056b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,10 @@ before_install: export TARGET=x86_64-unknown-linux-gnu; elif [[ $TRAVIS_OS_NAME == "windows" ]]; then export TARGET=x86_64-pc-windows-msvc; + if [[ -z $TRAVIS_TAG ]]; then + choco install nuget.commandline; + nuget install WiX -version 3.11.1; + fi elif [[ $TRAVIS_OS_NAME == "osx" ]]; then export TARGET=x86_64-apple-darwin; fi @@ -56,10 +60,6 @@ before_deploy: zip bottom_i686-pc-windows-msvc.zip "btm.exe"; python "./deployment/windows/choco/choco_packager.py" "bottom_i686-pc-windows-msvc.zip" "bottom_x86_64-pc-windows-msvc.zip" $TRAVIS_TAG "./deployment/windows/choco/bottom.nuspec.template" "./deployment/windows/choco/chocolateyinstall.ps1.template" "./deployment/windows/choco/bottom.nuspec" "./deployment/windows/choco/tools/chocolateyinstall.ps1" "./deployment/windows/choco/tools/"; zip choco.zip "./deployment/windows/choco/bottom.nuspec" "./deployment/windows/choco/tools/"; - # Generating msi - # See https://travis-ci.community/t/unable-to-install-wix-toolset/1071 for why we do nuget. - choco install nuget.commandline; - nuget install WiX.Toolset; cargo install cargo-wix; cargo wix init; cargo wix;