mirror of
https://github.com/openziti/desktop-edge-win.git
synced 2026-10-12 07:48:05 +00:00
bump version again to test auto-update and try git pull to see if it works
This commit is contained in:
@@ -59,7 +59,13 @@ if($gituser -eq "ziti-ci") {
|
||||
echo ========================================================
|
||||
git status 2>&1
|
||||
|
||||
echo "GIT: trying git pull to see if it'll 'usually' work"
|
||||
git pull
|
||||
|
||||
echo "GIT: git commit -m '[ci skip] committing updated version related files'"
|
||||
git commit -m "[ci skip] committing updated version related files" 2>&1
|
||||
|
||||
echo "GIT: push"
|
||||
git push 2>&1
|
||||
} else {
|
||||
echo "branch $b does not match the regex. no commit/no push"
|
||||
|
||||
@@ -48,16 +48,6 @@ if %ACTUAL_ERR% NEQ 0 (
|
||||
echo result of ninja build: %ACTUAL_ERR%
|
||||
)
|
||||
|
||||
IF "%GIT_BRANCH%"=="master" GOTO RELEASE
|
||||
echo Publishing to snapshot repo
|
||||
ziti-ci publish artifactory --groupId=ziti-tunnel-win.amd64.windows --artifactId=ziti-tunnel-win --version=%BUILD_VERSION%-SNAPSHOT --target=service/ziti-tunnel-win.zip 2>&1
|
||||
REM ziti-ci publish artifactory --groupId=ziti-tunnel-win.amd64.windows --artifactId=ziti-tunnel-win --version=%BUILD_VERSION%-SNAPSHOT --target=service/ziti-tunnel-win.zip --classifier=%GIT_BRANCH% 2>&1
|
||||
GOTO END
|
||||
|
||||
:RELEASE
|
||||
echo NO LONGER PUBLISHING TO ARTIFACTORY.
|
||||
REM echo Publishing release
|
||||
REM ziti-ci publish artifactory --groupId=ziti-tunnel-win.amd64.windows --artifactId=ziti-tunnel-win --version=%BUILD_VERSION% --target=service/ziti-tunnel-win.zip 2>&1
|
||||
GOTO END
|
||||
|
||||
:BUILD_VERSION_ERROR
|
||||
@@ -86,7 +76,6 @@ echo current dir: %CD%
|
||||
echo configuring git - relies on build.bat successfully grabbing ziti-ci and build.bat updating service/ziti-tunnel/version.go
|
||||
ziti-ci configure-git 2>&1
|
||||
|
||||
REM echo git commit -m "[ci skip] committing updated version information" complete: %ERRORLEVEL%
|
||||
echo ========================================================
|
||||
echo issuing git push
|
||||
echo ========================================================
|
||||
|
||||
Reference in New Issue
Block a user