From 99d8edc133cf2ee453fd91ca280401937f55c359 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 22:53:53 -0400 Subject: [PATCH] move where the branch is pulled and use git push --- service/test-push.bat | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 5c96be4c..aa19783c 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -6,6 +6,16 @@ set /p BUILD_VERSION=<%ZITI_TUNNEL_WIN_ROOT%version set GO111MODULE=on cd /d %ZITI_TUNNEL_WIN_ROOT% + + +@echo converting shallow clone so travis can co: %GIT_BRANCH% +git remote set-branches origin %GIT_BRANCH% 2>&1 +git fetch --depth 1 origin %GIT_BRANCH% 2>&1 +git checkout %GIT_BRANCH% 2>&1 + + + + echo fetching ziti-ci 2>&1 call %SVC_ROOT_DIR%/../get-ziti-ci.bat echo ziti-ci has been retrieved. running: ziti-ci version 2>&1 @@ -21,7 +31,7 @@ type version 2>&1 @echo ======================================================== 2>&1 @echo trying git add and commit 2>&1 @echo ======================================================== 2>&1 -git diff 2>&1 + git add service/ziti-tunnel/version.go 2>&1 @echo --------------------------- 2>&1 type service/ziti-tunnel/version.go 2>&1 @@ -29,15 +39,16 @@ type service/ziti-tunnel/version.go 2>&1 @echo --------------------------- 2>&1 type %SVC_ROOT_DIR%/ziti-tunnel/version.go 2>&1 @echo --------------------------- 2>&1 -git diff 2>&1 -git commit -m "updating version" 2>&1 -git diff 2>&1 + +git commit -m "[skip ci] updating version" 2>&1 + @echo ======================================================== 2>&1 @echo trying git push 2>&1 @echo ======================================================== 2>&1 git status 2>&1 -git push origin HEAD:%GIT_BRANCH% 2>&1 +git push 2>&1 +rem origin HEAD:%GIT_BRANCH% 2>&1 REM git push origin HEAD: 2>&1 REM git diff 2>&1