diff --git a/.travis.yml b/.travis.yml index 2f9036b5..30b57670 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ branches: # - "master" install: - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja --no-progress; fi before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) diff --git a/service/build.bat b/service/build.bat index 6a52a176..5dbfac62 100644 --- a/service/build.bat +++ b/service/build.bat @@ -13,17 +13,17 @@ IF "%1"=="quick" ( GOTO QUICK ) -echo fetching ziti-ci -call %SVC_ROOT_DIR%/../get-ziti-ci.bat -echo ziti-ci has been retrieved. running: ziti-ci version -ziti-ci version +echo fetching ziti-ci 2>&1 +call %SVC_ROOT_DIR%/../get-ziti-ci.bat 2>&1 +echo ziti-ci has been retrieved. running: ziti-ci version 2>&1 +ziti-ci version 2>&1 -echo generating version info - this will get pushed from publish.bat in CI _if_ publish.bat started build.bat +echo generating version info - this will get pushed from publish.bat in CI _if_ publish.bat started build.bat 2>&1 ziti-ci generate-build-info --noAddNoCommit --useVersion=false %SVC_ROOT_DIR%/ziti-tunnel/version.go main --verbose 2>&1 -echo calling powershell script to update versions in UI and Installer -powershell -file ..\update-versions.ps1 -echo version info generated +echo calling powershell script to update versions in UI and Installer 2>&1 +powershell -file %ZITI_TUNNEL_WIN_ROOT%update-versions.ps1 2>&1 +echo version info generate 2>&1d goto QUICK :CLEAN