From 241368705e764167176cec81fdc8af42d8be57f7 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 5 Aug 2020 08:56:09 -0400 Subject: [PATCH 1/8] try publishing from master into github --- .travis.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 24c429f7..567dea9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,4 +18,18 @@ before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: - - service/publish.bat \ No newline at end of file + - service/publish.bat + +stages: + - name: deploy + if: branch = master + +deploy: + provider: releases + skip_cleanup: true + api_key: + secure: Tvlr3Z6iHlFs+FigBa2ukBpGU67+AaFwxjltlhzouiIFMUTsiMAvmYY1HLvOySTjh3uOxanu/yO80BCa5tFr4RHTpmKfz6Jc3TJFiXestuaPgzcIvCC3iT95YSbPgYzkTczeUsrvn0RB9pq8vyYh2a9Wn+AqIA9r5sbWuKwyPnbSVFQBSgXLHiAc9MWVYX5C0n4E/0yiY3tZgH6s5t6/27A8YE2O3DVnSTXYHiS3vKx6STrFwkn+vejJnm+5add5FVpcBfaZ1PJIRL7Jzu6OiQHKM0kZ9RBNSV3KHjHxtdhp8K5frsIT856SxzfNkVRPRuaJVrsBs1hYr2F7xYGs7XGq/2oTp8qzdAodTtjPWP3gT3eSiI8kwFtXvvDAHvTjtxmc1BTIGK+z5X/qRue9swNKeiqo4/Fj2902xYdT3Ifw8nyxn/U0IeZEJMakwADX+S9YAR7BYGxdhhBCCpfAifWuLCQniJsiuS/w15cfJ6RcsjBnNvxb1aLkcvJoAj8v6Sahdu4ngL7ck0/UDsfd3pRehVCkbZePrtQTVd62VxbqmWz9PnZRNI2A+VzUcStRPbgl6fZcxnVnbympj6QuDCCM6wmcd3II/UjcaqudIbtDwZxXtjqYhip3L222JB8SmDc8vV9W9su/07oCUuuQRCrKyukaBoF4qYV+dcLyODA= + file: "service/ziti-tunnel-win.zip" + on: + repo: openziti/desktop-edge-win + branch: master \ No newline at end of file From b60424071fd720e2b196df3d4f05b3d91f2e7ff9 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 5 Aug 2020 09:23:57 -0400 Subject: [PATCH 2/8] based on feedback from travis - try using this to add the key --- service/publish.bat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/service/publish.bat b/service/publish.bat index 58aa5c19..e916e410 100644 --- a/service/publish.bat +++ b/service/publish.bat @@ -73,6 +73,10 @@ CALL :FAIL %ERRORLEVEL% "git add failed" ssh-keyscan -H github.com >> ~/.ssh/known_hosts ssh -vT -i github_deploy_key git@github.com 2>&1 +@echo issuing ssh-keyscan -t rsa github.com 2>&1 >> /root/.ssh/known_hosts +ssh-keyscan -t rsa github.com 2>&1 >> /root/.ssh/known_hosts +ssh -vT -i github_deploy_key git@github.com 2>&1 + @echo issuing commit git commit -m "[ci skip] committing updated version information" 2>&1 CALL :FAIL %ERRORLEVEL% "git commit failed" From 1a6a88ff803fcf639a4493bcb13f8884f5c4c73e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 5 Aug 2020 09:25:38 -0400 Subject: [PATCH 3/8] remove old ssh-keyscan block --- service/publish.bat | 4 ---- 1 file changed, 4 deletions(-) diff --git a/service/publish.bat b/service/publish.bat index e916e410..3b3b8dbf 100644 --- a/service/publish.bat +++ b/service/publish.bat @@ -69,10 +69,6 @@ git add service/ziti-tunnel/version.go 2>&1 CALL :FAIL %ERRORLEVEL% "git add failed" @echo git add service/ziti-tunnel/version.go complete: %ERRORLEVEL% -@echo issuing ssh -vT -i github_deploy_key git@github.com -ssh-keyscan -H github.com >> ~/.ssh/known_hosts -ssh -vT -i github_deploy_key git@github.com 2>&1 - @echo issuing ssh-keyscan -t rsa github.com 2>&1 >> /root/.ssh/known_hosts ssh-keyscan -t rsa github.com 2>&1 >> /root/.ssh/known_hosts ssh -vT -i github_deploy_key git@github.com 2>&1 From 576186f1dba39fe5403c9cbcd0e88bb6bbd6fbb2 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 5 Aug 2020 09:46:02 -0400 Subject: [PATCH 4/8] remove the 2>1 from the echo --- service/publish.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/publish.bat b/service/publish.bat index 3b3b8dbf..abaa157a 100644 --- a/service/publish.bat +++ b/service/publish.bat @@ -69,7 +69,7 @@ git add service/ziti-tunnel/version.go 2>&1 CALL :FAIL %ERRORLEVEL% "git add failed" @echo git add service/ziti-tunnel/version.go complete: %ERRORLEVEL% -@echo issuing ssh-keyscan -t rsa github.com 2>&1 >> /root/.ssh/known_hosts +@echo issuing ssh-keyscan ssh-keyscan -t rsa github.com 2>&1 >> /root/.ssh/known_hosts ssh -vT -i github_deploy_key git@github.com 2>&1 From 8ef07af4bf9edbc84cea541f4d14c66c258ce5c5 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 5 Aug 2020 13:34:10 -0400 Subject: [PATCH 5/8] still fighting with travis --- .travis.yml | 3 +++ service/publish.bat | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 567dea9a..e26fad2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,13 @@ install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; fi before_script: + - type ${TRAVIS_HOME}/.ssh/known_hosts - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: + - type ${TRAVIS_HOME}/.ssh/known_hosts - service/publish.bat + - type ${TRAVIS_HOME}/.ssh/known_hosts stages: - name: deploy diff --git a/service/publish.bat b/service/publish.bat index abaa157a..bc459235 100644 --- a/service/publish.bat +++ b/service/publish.bat @@ -69,8 +69,14 @@ git add service/ziti-tunnel/version.go 2>&1 CALL :FAIL %ERRORLEVEL% "git add failed" @echo git add service/ziti-tunnel/version.go complete: %ERRORLEVEL% -@echo issuing ssh-keyscan +@echo trying to output ${TRAVIS_HOME}/.ssh/known_hosts to stdout +type ${TRAVIS_HOME}/.ssh/known_hosts + +@echo issuing ssh-keyscan"zit ssh-keyscan -t rsa github.com 2>&1 >> /root/.ssh/known_hosts + +@echo trying to output ${TRAVIS_HOME}/.ssh/known_hosts to stdout + ssh -vT -i github_deploy_key git@github.com 2>&1 @echo issuing commit From a03a60c3d06da456a66d8a3f86dc5e1eb34012e7 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 5 Aug 2020 13:50:19 -0400 Subject: [PATCH 6/8] use cat from the .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e26fad2b..c973515b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,9 @@ before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: - - type ${TRAVIS_HOME}/.ssh/known_hosts + - cat ${TRAVIS_HOME}/.ssh/known_hosts - service/publish.bat - - type ${TRAVIS_HOME}/.ssh/known_hosts + - cat ${TRAVIS_HOME}/.ssh/known_hosts stages: - name: deploy From 33af39cd5980c3402b67ba3a7530b12ad15d3e64 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 5 Aug 2020 13:57:16 -0400 Subject: [PATCH 7/8] missed a type... ugh --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c973515b..fc3f04f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; fi before_script: - - type ${TRAVIS_HOME}/.ssh/known_hosts + - cat ${TRAVIS_HOME}/.ssh/known_hosts - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: From e6a372f407b09f12e8451c1c79188018e390d384 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 5 Aug 2020 14:01:55 -0400 Subject: [PATCH 8/8] apparently type nor cat are availale in .travis.yml --- .travis.yml | 3 --- service/publish.bat | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc3f04f8..567dea9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,13 +15,10 @@ install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; fi before_script: - - cat ${TRAVIS_HOME}/.ssh/known_hosts - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: - - cat ${TRAVIS_HOME}/.ssh/known_hosts - service/publish.bat - - cat ${TRAVIS_HOME}/.ssh/known_hosts stages: - name: deploy diff --git a/service/publish.bat b/service/publish.bat index bc459235..ae2d6fea 100644 --- a/service/publish.bat +++ b/service/publish.bat @@ -76,6 +76,7 @@ type ${TRAVIS_HOME}/.ssh/known_hosts ssh-keyscan -t rsa github.com 2>&1 >> /root/.ssh/known_hosts @echo trying to output ${TRAVIS_HOME}/.ssh/known_hosts to stdout +type ${TRAVIS_HOME}/.ssh/known_hosts ssh -vT -i github_deploy_key git@github.com 2>&1