From e111763462d8d9ef6be2d8f5f55e1dd94dd697e1 Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Thu, 8 Oct 2020 14:11:57 +0100 Subject: [PATCH 01/71] Do not hide windows when not attached. --- DesktopEdge/MainMenu.xaml.cs | 5 +++-- DesktopEdge/MainWindow.xaml.cs | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DesktopEdge/MainMenu.xaml.cs b/DesktopEdge/MainMenu.xaml.cs index ed405bdf..cc7f772b 100644 --- a/DesktopEdge/MainMenu.xaml.cs +++ b/DesktopEdge/MainMenu.xaml.cs @@ -142,8 +142,7 @@ namespace ZitiDesktopEdge } private void ShowFeedback(object sender, MouseButtonEventArgs e) { ServiceClient.Client client = (ServiceClient.Client)Application.Current.Properties["ServiceClient"]; - var mailMessage = new MailMessage(); - mailMessage.From = new MailAddress("ziti-support@netfoundry.io"); + var mailMessage = new MailMessage("", "ziti-support@netfoundry.io"); mailMessage.Subject = "Ziti Support"; mailMessage.IsBodyHtml = true; mailMessage.Body = ""; @@ -193,6 +192,7 @@ namespace ZitiDesktopEdge DetachButton.Visibility = Visibility.Collapsed; AttachButton.Visibility = Visibility.Visible; Arrow.Visibility = Visibility.Collapsed; + UIModel.HideOnLostFocus = false; if (OnAttachmentChange != null) { OnAttachmentChange(false); } @@ -210,6 +210,7 @@ namespace ZitiDesktopEdge DetachButton.Visibility = Visibility.Visible; AttachButton.Visibility = Visibility.Collapsed; Arrow.Visibility = Visibility.Visible; + UIModel.HideOnLostFocus = true; if (OnAttachmentChange != null) { OnAttachmentChange(true); } diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs index a69a9ae5..badd9d52 100644 --- a/DesktopEdge/MainWindow.xaml.cs +++ b/DesktopEdge/MainWindow.xaml.cs @@ -85,11 +85,13 @@ namespace ZitiDesktopEdge { } private void MainWindow_Deactivated(object sender, EventArgs e) { + if (UIModel.HideOnLostFocus) { #if DEBUG Debug.WriteLine("debug is enabled - windows pinned"); #else this.Visibility = Visibility.Collapsed; #endif + } } private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) { @@ -113,6 +115,7 @@ namespace ZitiDesktopEdge { _isAttached = false; IdentityMenu.Arrow.Visibility = Visibility.Collapsed; Arrow.Visibility = Visibility.Collapsed; + UIModel.HideOnLostFocus = false; MainMenu.Detach(); this.DragMove(); } From 5f066458d63eca6c03f0bd61e0c31fa9db46c2eb Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 15:26:20 -0400 Subject: [PATCH 02/71] adding a test-push.bat to see if we can get travis to push finall --- .travis.yml | 2 +- service/test-push.bat | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 service/test-push.bat diff --git a/.travis.yml b/.travis.yml index ffa548bc..3b75af90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ 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 + - service/test-push.bat stages: - name: deploy diff --git a/service/test-push.bat b/service/test-push.bat new file mode 100644 index 00000000..94ee3b2e --- /dev/null +++ b/service/test-push.bat @@ -0,0 +1,35 @@ +@echo off +set CURDIR=%CD% +set SVC_ROOT_DIR=%~dp0 +set ZITI_TUNNEL_WIN_ROOT=%SVC_ROOT_DIR%..\ +set /p BUILD_VERSION=<%ZITI_TUNNEL_WIN_ROOT%version +set GO111MODULE=on +cd /d %ZITI_TUNNEL_WIN_ROOT% + +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 generating version info - this will get pushed from publish.bat in CI _if_ publish.bat started build.bat +ziti-ci generate-build-info --noAddNoCommit --useVersion=false %SVC_ROOT_DIR%/ziti-tunnel/version.go main --verbose 2>&1 +echo version info generated + +type version + +@echo ======================================================== +@echo trying git add and commit +@echo ======================================================== +git add version +git commit -m "updating version" + + +@echo ======================================================== +@echo trying git push +@echo ======================================================== +git push + + +@echo ======================================================== +@echo all done +@echo ======================================================== \ No newline at end of file From 7b718862da4f6fac848a1e9a9cf2bf027cd86e6e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 15:47:06 -0400 Subject: [PATCH 03/71] add git diff between each statement --- service/test-push.bat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/service/test-push.bat b/service/test-push.bat index 94ee3b2e..d954fe31 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -20,9 +20,11 @@ type version @echo ======================================================== @echo trying git add and commit @echo ======================================================== +git diff git add version +git diff git commit -m "updating version" - +git diff @echo ======================================================== @echo trying git push From 2a29c93c7e969e8886cdeae04865499fa80899d1 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 15:54:09 -0400 Subject: [PATCH 04/71] update the proper path --- service/test-push.bat | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index d954fe31..c6019b2a 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -20,8 +20,7 @@ type version @echo ======================================================== @echo trying git add and commit @echo ======================================================== -git diff -git add version +git add service/ziti-tunnel/version.go git diff git commit -m "updating version" git diff From a66eb6cfcceb4bd681d0c32d74ab9473ce8c05c5 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 16:13:48 -0400 Subject: [PATCH 05/71] more git debugging on travis --- service/test-push.bat | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index c6019b2a..378e90c2 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -11,16 +11,24 @@ call %SVC_ROOT_DIR%/../get-ziti-ci.bat echo ziti-ci has been retrieved. running: ziti-ci version ziti-ci version -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 ziti-ci generate-build-info --noAddNoCommit --useVersion=false %SVC_ROOT_DIR%/ziti-tunnel/version.go main --verbose 2>&1 -echo version info generated - +@echo version info generated +@echo --------------------------- type version +@echo --------------------------- @echo ======================================================== @echo trying git add and commit @echo ======================================================== +git diff git add service/ziti-tunnel/version.go +@echo --------------------------- +type service/ziti-tunnel/version.go +@echo --------------------------- +@echo --------------------------- +type %SVC_ROOT_DIR%/ziti-tunnel/version.go +@echo --------------------------- git diff git commit -m "updating version" git diff @@ -29,6 +37,7 @@ git diff @echo trying git push @echo ======================================================== git push +git diff @echo ======================================================== From 01736afbd28b987a57a2459b12ed8b32f2978acf Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 16:19:00 -0400 Subject: [PATCH 06/71] put 2>&1 on all the lines... --- service/test-push.bat | 61 ++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 378e90c2..1f981144 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -6,40 +6,41 @@ set /p BUILD_VERSION=<%ZITI_TUNNEL_WIN_ROOT%version set GO111MODULE=on cd /d %ZITI_TUNNEL_WIN_ROOT% -echo fetching ziti-ci +echo fetching ziti-ci 2>&1 call %SVC_ROOT_DIR%/../get-ziti-ci.bat -echo ziti-ci has been retrieved. running: ziti-ci version -ziti-ci version +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 version info generated -@echo --------------------------- -type version -@echo --------------------------- +@echo version info generated 2>&1 +@echo --------------------------- 2>&1 +type version 2>&1 +@echo --------------------------- 2>&1 -@echo ======================================================== -@echo trying git add and commit -@echo ======================================================== -git diff -git add service/ziti-tunnel/version.go -@echo --------------------------- -type service/ziti-tunnel/version.go -@echo --------------------------- -@echo --------------------------- -type %SVC_ROOT_DIR%/ziti-tunnel/version.go -@echo --------------------------- -git diff -git commit -m "updating version" -git diff +@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 +@echo --------------------------- 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 -@echo ======================================================== -@echo trying git push -@echo ======================================================== -git push -git diff +@echo ======================================================== 2>&1 +@echo trying git push 2>&1 +@echo ======================================================== 2>&1 +git status 2>&1 +git push 2>&1 +git diff 2>&1 -@echo ======================================================== -@echo all done -@echo ======================================================== \ No newline at end of file +@echo ======================================================== 2>&1 +@echo all done 2>&1 +@echo ======================================================== 2>&1 \ No newline at end of file From b93890180733353042184cab0099b1653108436d Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 16:23:49 -0400 Subject: [PATCH 07/71] more diagnositcs of travis/git --- service/test-push.bat | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 1f981144..ad52c3d6 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -15,7 +15,7 @@ ziti-ci version 2>&1 ziti-ci generate-build-info --noAddNoCommit --useVersion=false %SVC_ROOT_DIR%/ziti-tunnel/version.go main --verbose 2>&1 @echo version info generated 2>&1 @echo --------------------------- 2>&1 -type version 2>&1 +type version @echo --------------------------- 2>&1 @echo ======================================================== 2>&1 @@ -23,12 +23,13 @@ type version 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 -@echo --------------------------- 2>&1 -@echo --------------------------- 2>&1 -type %SVC_ROOT_DIR%/ziti-tunnel/version.go 2>&1 -@echo --------------------------- 2>&1 +@echo -a------------------------- 2>&1 +type service/ziti-tunnel/version.go +@echo -a------------------------- 2>&1 +@echo -b------------------------- 2>&1 +type %SVC_ROOT_DIR%/ziti-tunnel/version.go +@echo %SVC_ROOT_DIR%/ziti-tunnel/version.go +@echo -b------------------------- 2>&1 git diff 2>&1 git commit -m "updating version" 2>&1 git diff 2>&1 @@ -36,6 +37,10 @@ git diff 2>&1 @echo ======================================================== 2>&1 @echo trying git push 2>&1 @echo ======================================================== 2>&1 +@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 git status 2>&1 git push 2>&1 git diff 2>&1 From dfe6f56e3f4370a10dcaf937cfdf93459c77431a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 16:27:37 -0400 Subject: [PATCH 08/71] move message higher up --- service/test-push.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index ad52c3d6..60076a4b 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -34,12 +34,12 @@ git diff 2>&1 git commit -m "updating version" 2>&1 git diff 2>&1 -@echo ======================================================== 2>&1 -@echo trying git push 2>&1 -@echo ======================================================== 2>&1 @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 +@echo ======================================================== 2>&1 +@echo trying git push 2>&1 +@echo ======================================================== 2>&1 git checkout %GIT_BRANCH% 2>&1 git status 2>&1 git push 2>&1 From 67e69f925b96a44e2e8b043fb64105c2e8fce7f1 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 17:04:58 -0400 Subject: [PATCH 09/71] moar git and travis debugging --- service/test-push.bat | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 60076a4b..ed256fe6 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -38,10 +38,13 @@ git diff 2>&1 git remote set-branches origin %GIT_BRANCH% 2>&1 git fetch --depth 1 origin %GIT_BRANCH% 2>&1 @echo ======================================================== 2>&1 -@echo trying git push 2>&1 -@echo ======================================================== 2>&1 +@echo trying git checkout %GIT_BRANCH% 2>&1 git checkout %GIT_BRANCH% 2>&1 +@echo trying git diff 2>&1 +git diff 2>&1 +@echo trying git status 2>&1 git status 2>&1 +@echo trying git push 2>&1 git push 2>&1 git diff 2>&1 From aa316e170b7e1b1a7ed0843e5e2bc5fa8217639d Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 20:18:19 -0400 Subject: [PATCH 10/71] testing --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 369bd4c2..dcafe365 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.0.29 +0.0.29a From 5d4c390250ff54baa8199649dabb3e7d04c73b68 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 20:21:19 -0400 Subject: [PATCH 11/71] try to push to the branch directly instead of trying to move to the branch --- service/test-push.bat | 6 +++--- version | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index ed256fe6..65b5c11f 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -31,7 +31,7 @@ type %SVC_ROOT_DIR%/ziti-tunnel/version.go @echo %SVC_ROOT_DIR%/ziti-tunnel/version.go @echo -b------------------------- 2>&1 git diff 2>&1 -git commit -m "updating version" 2>&1 +git commit -m "[ci skip] updating version" 2>&1 git diff 2>&1 @echo converting shallow clone so travis can co: %GIT_BRANCH% @@ -44,8 +44,8 @@ git checkout %GIT_BRANCH% 2>&1 git diff 2>&1 @echo trying git status 2>&1 git status 2>&1 -@echo trying git push 2>&1 -git push 2>&1 +@echo trying git push origin HEAD:%GIT_BRANCH% 2>&1 +git push origin HEAD:%GIT_BRANCH% 2>&1 git diff 2>&1 diff --git a/version b/version index dcafe365..369bd4c2 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.0.29a +0.0.29 From 6581ea512ab398ce0b2233c5395aff0316a52d93 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 20:33:04 -0400 Subject: [PATCH 12/71] remove changing to a branch and instead push to the branch from detached head --- service/test-push.bat | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 65b5c11f..27d1a4fe 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -28,26 +28,26 @@ type service/ziti-tunnel/version.go @echo -a------------------------- 2>&1 @echo -b------------------------- 2>&1 type %SVC_ROOT_DIR%/ziti-tunnel/version.go -@echo %SVC_ROOT_DIR%/ziti-tunnel/version.go +@echo %SVC_ROOT_DIR%/ziti-tunnel/version.go 2>&1 @echo -b------------------------- 2>&1 + +@echo issuing git diff 2>&1 git diff 2>&1 + +@echo issuing git commit 2>&1 git commit -m "[ci skip] updating version" 2>&1 + +@echo issuing git diff 2>&1 git diff 2>&1 -@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 -@echo ======================================================== 2>&1 -@echo trying git checkout %GIT_BRANCH% 2>&1 -git checkout %GIT_BRANCH% 2>&1 -@echo trying git diff 2>&1 -git diff 2>&1 -@echo trying git status 2>&1 +@echo issuing git status 2>&1 git status 2>&1 -@echo trying git push origin HEAD:%GIT_BRANCH% 2>&1 -git push origin HEAD:%GIT_BRANCH% 2>&1 -git diff 2>&1 +@echo issuing git push origin HEAD:%GIT_BRANCH% 2>&1 +git push origin HEAD:%GIT_BRANCH% 2>&1 + +@echo issuing git diff 2>&1 +git diff 2>&1 @echo ======================================================== 2>&1 @echo all done 2>&1 From 93cb18836fff710c55e44784f75b257718f638e0 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 20:42:17 -0400 Subject: [PATCH 13/71] odd error at the end of script, remove a few lines --- service/test-push.bat | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 27d1a4fe..a9fc6ab5 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -44,11 +44,7 @@ git diff 2>&1 git status 2>&1 @echo issuing git push origin HEAD:%GIT_BRANCH% 2>&1 -git push origin HEAD:%GIT_BRANCH% 2>&1 +REM git push origin HEAD:%GIT_BRANCH% 2 > & 1 +git push origin HEAD:test-git-push -@echo issuing git diff 2>&1 -git diff 2>&1 - -@echo ======================================================== 2>&1 -@echo all done 2>&1 -@echo ======================================================== 2>&1 \ No newline at end of file +echo "THIS IS THE END" From 9b9f052352fa3ca763b7d3494ea9708c3a1c3ab9 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 20:51:07 -0400 Subject: [PATCH 14/71] add a sleep to see if the output will get logged --- service/test-push.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/service/test-push.bat b/service/test-push.bat index a9fc6ab5..3ab2f7d9 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -48,3 +48,5 @@ REM git push origin HEAD:%GIT_BRANCH% 2 > & 1 git push origin HEAD:test-git-push echo "THIS IS THE END" + +sleep 5 \ No newline at end of file From 71af51ffbe478542ab351efa3aef63193e02f591 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 20:58:48 -0400 Subject: [PATCH 15/71] travis is still hanging up for some reason - removing more and try push'ing from the travis.yml --- .travis.yml | 1 + service/test-push.bat | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b75af90..9b0aaddf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ before_script: script: - service/test-push.bat + - git push origin HEAD:test-git-push stages: - name: deploy diff --git a/service/test-push.bat b/service/test-push.bat index 3ab2f7d9..04a837f3 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -23,13 +23,7 @@ type version @echo ======================================================== 2>&1 git diff 2>&1 git add service/ziti-tunnel/version.go 2>&1 -@echo -a------------------------- 2>&1 -type service/ziti-tunnel/version.go -@echo -a------------------------- 2>&1 -@echo -b------------------------- 2>&1 -type %SVC_ROOT_DIR%/ziti-tunnel/version.go -@echo %SVC_ROOT_DIR%/ziti-tunnel/version.go 2>&1 -@echo -b------------------------- 2>&1 + @echo issuing git diff 2>&1 git diff 2>&1 @@ -44,8 +38,7 @@ git diff 2>&1 git status 2>&1 @echo issuing git push origin HEAD:%GIT_BRANCH% 2>&1 -REM git push origin HEAD:%GIT_BRANCH% 2 > & 1 -git push origin HEAD:test-git-push + echo "THIS IS THE END" From 8832b36f07ec744e7975878eb1b525e0d444271e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 21:05:46 -0400 Subject: [PATCH 16/71] try a git log to see if the commit works --- service/test-push.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/service/test-push.bat b/service/test-push.bat index 04a837f3..3dd379a9 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -39,7 +39,8 @@ git status 2>&1 @echo issuing git push origin HEAD:%GIT_BRANCH% 2>&1 - +git push origin HEAD:test-git-push +git log -n 2 echo "THIS IS THE END" sleep 5 \ No newline at end of file From ceb6a247bdae98d2592ae5cdef4036c8dee616a2 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 21:18:49 -0400 Subject: [PATCH 17/71] still trying to get travis to not block forever --- service/test-push.bat | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 3dd379a9..bcc41d56 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -14,33 +14,16 @@ ziti-ci version 2>&1 @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 version info generated 2>&1 -@echo --------------------------- 2>&1 -type version -@echo --------------------------- 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 issuing git diff 2>&1 -git diff 2>&1 - @echo issuing git commit 2>&1 git commit -m "[ci skip] updating version" 2>&1 -@echo issuing git diff 2>&1 -git diff 2>&1 - -@echo issuing git status 2>&1 -git status 2>&1 - @echo issuing git push origin HEAD:%GIT_BRANCH% 2>&1 git push origin HEAD:test-git-push git log -n 2 echo "THIS IS THE END" -sleep 5 \ No newline at end of file +sleep 5 From 2f03d6a232e008a47fd5405c01183d858e3b97a8 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 21:38:46 -0400 Subject: [PATCH 18/71] take the push out for now to see if travis completes --- service/test-push.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/test-push.bat b/service/test-push.bat index bcc41d56..46828675 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -22,7 +22,7 @@ git commit -m "[ci skip] updating version" 2>&1 @echo issuing git push origin HEAD:%GIT_BRANCH% 2>&1 -git push origin HEAD:test-git-push +REM git push origin HEAD:test-git-push git log -n 2 echo "THIS IS THE END" From dda1e2353d38de587b6322315f8ef52446f905d9 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 22:20:25 -0400 Subject: [PATCH 19/71] revert to the last good build commit --- service/test-push.bat | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 46828675..1f981144 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -14,16 +14,33 @@ ziti-ci version 2>&1 @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 version info generated 2>&1 +@echo --------------------------- 2>&1 +type version 2>&1 +@echo --------------------------- 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 +@echo --------------------------- 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 -@echo issuing git commit 2>&1 -git commit -m "[ci skip] updating version" 2>&1 +@echo ======================================================== 2>&1 +@echo trying git push 2>&1 +@echo ======================================================== 2>&1 +git status 2>&1 +git push 2>&1 +git diff 2>&1 -@echo issuing git push origin HEAD:%GIT_BRANCH% 2>&1 -REM git push origin HEAD:test-git-push -git log -n 2 -echo "THIS IS THE END" - -sleep 5 +@echo ======================================================== 2>&1 +@echo all done 2>&1 +@echo ======================================================== 2>&1 \ No newline at end of file From a21bd3da6de9f3af7a008958e5685d8dc39de3d8 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 22:21:04 -0400 Subject: [PATCH 20/71] remove push from .travis too --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b0aaddf..c5b29912 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ before_script: script: - service/test-push.bat - - git push origin HEAD:test-git-push stages: - name: deploy @@ -33,4 +32,4 @@ deploy: file: "service/ziti-tunnel-win.zip" on: repo: openziti/desktop-edge-win - branch: master \ No newline at end of file + branch: master From 5a44ad1ad9868718759c717f432f7397127f9310 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 22:25:01 -0400 Subject: [PATCH 21/71] put the push back now --- service/test-push.bat | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 1f981144..5c96be4c 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -37,10 +37,12 @@ git diff 2>&1 @echo trying git push 2>&1 @echo ======================================================== 2>&1 git status 2>&1 -git push 2>&1 -git diff 2>&1 +git push origin HEAD:%GIT_BRANCH% 2>&1 +REM git push origin HEAD: 2>&1 +REM git diff 2>&1 @echo ======================================================== 2>&1 @echo all done 2>&1 -@echo ======================================================== 2>&1 \ No newline at end of file +@echo ======================================================== 2>&1 +sleep 5 \ No newline at end of file From 8275dab7d1c75bc62ba116c42a4bc0060ad1a81b Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 12 Oct 2020 22:45:21 -0400 Subject: [PATCH 22/71] updating version --- service/ziti-tunnel/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index e319e487..9ca42932 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -20,9 +20,9 @@ package main const ( - Version = "0.0.25" - Revision = "6d78cc92a261" - Branch = "master" + Version = "0.0.29" + Revision = "5a44ad1ad986" + Branch = "test-git-push" BuildUser = "Clint D" - BuildDate = "2020-09-22 17:11:28" + BuildDate = "2020-10-12 22:45:16" ) From 6cf7e335c086836de289d6ec0bfb556280527588 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 12 Oct 2020 22:49:47 -0400 Subject: [PATCH 23/71] move the location of where the branch is updated --- service/test-push.bat | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/service/test-push.bat b/service/test-push.bat index 5c96be4c..1deef6ba 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 @@ -30,7 +40,7 @@ type service/ziti-tunnel/version.go 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 commit -m "[skip ci] updating version" 2>&1 git diff 2>&1 @echo ======================================================== 2>&1 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 24/71] 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 From d4a8d7fa4b9acb111921a178ac6e1742a7251a15 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 23:03:09 -0400 Subject: [PATCH 25/71] remove invalid commands --- service/test-push.bat | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 9fc3e915..5b73fddb 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -6,16 +6,11 @@ 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 @@ -33,25 +28,13 @@ type version 2>&1 @echo ======================================================== 2>&1 git add service/ziti-tunnel/version.go 2>&1 -@echo --------------------------- 2>&1 -type service/ziti-tunnel/version.go 2>&1 -@echo --------------------------- 2>&1 -@echo --------------------------- 2>&1 -type %SVC_ROOT_DIR%/ziti-tunnel/version.go 2>&1 -@echo --------------------------- 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 2>&1 -rem origin HEAD:%GIT_BRANCH% 2>&1 -REM git push origin HEAD: 2>&1 -REM git diff 2>&1 - @echo ======================================================== 2>&1 @echo all done 2>&1 From d505f018fd967472a14708342324df9bdb364a5e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 23:07:17 -0400 Subject: [PATCH 26/71] remove the call to status and try again --- service/test-push.bat | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 5b73fddb..73fe4765 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -32,8 +32,7 @@ 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 +@echo ======================================================== 2>&1 git push 2>&1 @echo ======================================================== 2>&1 From 666b0e5673934f221046b2261b418ac13eed7607 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 23:20:37 -0400 Subject: [PATCH 27/71] remove 2>&1 from git push to see if that unsticks travis... --- service/test-push.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 73fe4765..95a2723d 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -32,8 +32,8 @@ git commit -m "[skip ci] updating version" 2>&1 @echo ======================================================== 2>&1 @echo trying git push 2>&1 -@echo ======================================================== 2>&1 -git push 2>&1 +@echo ======================================================== 2>&1 +git push @echo ======================================================== 2>&1 @echo all done 2>&1 From b49ee6e3e5e8fc47a369423b6afb03d7ff301c43 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 23:24:48 -0400 Subject: [PATCH 28/71] one of these permutations should work... --- .travis.yml | 1 + service/test-push.bat | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c5b29912..163b28a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ before_script: script: - service/test-push.bat + - git status stages: - name: deploy diff --git a/service/test-push.bat b/service/test-push.bat index 95a2723d..5080efa7 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -28,12 +28,12 @@ type version 2>&1 @echo ======================================================== 2>&1 git add service/ziti-tunnel/version.go 2>&1 -git commit -m "[skip ci] updating version" 2>&1 +REM git commit -m "[skip ci] updating version" 2>&1 @echo ======================================================== 2>&1 @echo trying git push 2>&1 @echo ======================================================== 2>&1 -git push +REM git push @echo ======================================================== 2>&1 @echo all done 2>&1 From 247d37a4a6c7bd9d6fa041604f19cd5a48e65615 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 23:40:11 -0400 Subject: [PATCH 29/71] more trying --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 163b28a3..600a780f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,12 @@ before_script: script: - service/test-push.bat + +after_success: - git status - + - git commit -m "[skip ci] committing from travis" + - git push + stages: - name: deploy if: branch = master From 7e1789509afef56cb45b4d71329574a8ce5e1fca Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 12 Oct 2020 23:43:33 -0400 Subject: [PATCH 30/71] forgot the add. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 600a780f..5eea94fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ script: after_success: - git status + - git add service/ziti-tunnel/version.go - git commit -m "[skip ci] committing from travis" - git push From 456b8448ffa890015a89d1526745c8a4642064fc Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 13 Oct 2020 07:45:55 -0400 Subject: [PATCH 31/71] add a git config -l to see what's going on --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5eea94fb..7e08070c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ after_success: - git status - git add service/ziti-tunnel/version.go - git commit -m "[skip ci] committing from travis" + - git config -l - git push stages: From 69b3cf02f6c86a86e3e5e8b37742f2fed75edb59 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 07:48:11 -0400 Subject: [PATCH 32/71] [skip ci] committing from travis --- service/ziti-tunnel/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index e319e487..353659df 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -20,9 +20,9 @@ package main const ( - Version = "0.0.25" - Revision = "6d78cc92a261" - Branch = "master" + Version = "0.0.29" + Revision = "456b8448ffa8" + Branch = "test-git-push" BuildUser = "Clint D" - BuildDate = "2020-09-22 17:11:28" + BuildDate = "2020-10-13 07:47:31" ) From d51a632067f576cac2cd23b0d0c8ef771cdc0d8a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 13 Oct 2020 07:56:16 -0400 Subject: [PATCH 33/71] change where ziti-ci configure git is --- service/test-push.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/service/test-push.bat b/service/test-push.bat index 5080efa7..c1d1567f 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -15,6 +15,7 @@ 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 ziti-ci version 2>&1 +ziti-ci configure-git @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 From d270fe1437c0d2bfa2869daecbde544478bf139f Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 08:02:32 -0400 Subject: [PATCH 34/71] testing a commit as ziti-ci from local --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 1ec5b193..d9cc2a81 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,3 @@ components: * A Windows service which runs as the local system account which creates the TUN as well as manages the Ziti connections * A Windows UWP UI application that allows the interactively logged on user to interact with the Windows service - From 1a3330f5f028579fc6e539bc0b2f0700a2e0788f Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 08:03:34 -0400 Subject: [PATCH 35/71] add another line of output to see what the result is... --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7e08070c..fe5a04ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ before_script: script: - service/test-push.bat + - tail -c 70 github_deploy_key after_success: - git status From 319a2dc4abec47984bc517c159a401634be4ced7 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 08:10:44 -0400 Subject: [PATCH 36/71] see what github.com says to a -T --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fe5a04ee..35e54b04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ before_script: script: - service/test-push.bat - tail -c 70 github_deploy_key + - ssh -T git@github.com -i github_deploy_key after_success: - git status From 7d8cc541fca8260166f9e61c3f0a53dceefcba52 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 08:16:52 -0400 Subject: [PATCH 37/71] chmod the file to see if that will make ssh happier --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 35e54b04..09a0e634 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ before_script: script: - service/test-push.bat - tail -c 70 github_deploy_key + - chmod 600 github_deploy_key - ssh -T git@github.com -i github_deploy_key after_success: From 2ef880223fb1d43e663fabd37101e2b715ff8cfe Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 08:27:13 -0400 Subject: [PATCH 38/71] still trying to get travis placated --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09a0e634..ff838f96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,7 @@ before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: - - service/test-push.bat - - tail -c 70 github_deploy_key + - export GIT_TRACE=1; service/test-push.bat - chmod 600 github_deploy_key - ssh -T git@github.com -i github_deploy_key From da1a40c8120a6c0dffd4100e9bda8bcb4251d3f2 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 08:30:24 -0400 Subject: [PATCH 39/71] remove ssh call --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ff838f96..8664192e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,6 @@ before_script: script: - export GIT_TRACE=1; service/test-push.bat - chmod 600 github_deploy_key - - ssh -T git@github.com -i github_deploy_key after_success: - git status From 02eebf5e6d2aaa7c72dfb7d2a5685fa2ad36ebd6 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 08:38:37 -0400 Subject: [PATCH 40/71] put ssh command back, rearrange params --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8664192e..19549785 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ before_script: script: - export GIT_TRACE=1; service/test-push.bat - chmod 600 github_deploy_key + - ssh -T -i github_deploy_key github.com after_success: - git status From e616b0017667de2b920c38c06e03762d5369e7a3 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 08:49:22 -0400 Subject: [PATCH 41/71] move ssh command to the bat file to see if this helps --- .travis.yml | 2 -- service/test-push.bat | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 19549785..be7c53c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,6 @@ before_script: script: - export GIT_TRACE=1; service/test-push.bat - - chmod 600 github_deploy_key - - ssh -T -i github_deploy_key github.com after_success: - git status diff --git a/service/test-push.bat b/service/test-push.bat index c1d1567f..f9c030e5 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -17,6 +17,9 @@ echo ziti-ci has been retrieved. running: ziti-ci version 2>&1 ziti-ci version 2>&1 ziti-ci configure-git +@echo trying ssh +ssh -T -i github_deploy_key github.com + @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 version info generated 2>&1 From c3ec526960f8091ddb63e1d83505350232dce6a4 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 08:49:43 -0400 Subject: [PATCH 42/71] add 2>&1 to see if there's any std err missing --- service/test-push.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/test-push.bat b/service/test-push.bat index f9c030e5..867d8ee3 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -18,7 +18,7 @@ ziti-ci version 2>&1 ziti-ci configure-git @echo trying ssh -ssh -T -i github_deploy_key github.com +ssh -T -i github_deploy_key github.com 2>&1 @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 From 1c56827f4c9db34d0b19d21718ee3f91c83b857d Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 08:58:34 -0400 Subject: [PATCH 43/71] still trying to appease travis --- service/test-push.bat | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/service/test-push.bat b/service/test-push.bat index 867d8ee3..29d43326 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -17,7 +17,10 @@ echo ziti-ci has been retrieved. running: ziti-ci version 2>&1 ziti-ci version 2>&1 ziti-ci configure-git -@echo trying ssh +@echo ssh-keygen -R issued... trying ssh +ssh-keygen -R github.com + +@echo trying ssh instantly after running ssh-keygen -R github.com ssh -T -i github_deploy_key github.com 2>&1 @echo generating version info - this will get pushed from publish.bat in CI _if_ publish.bat started build.bat 2>&1 From fbca7c3428a0ab70abfae1bf9617e9a8f15bb3a8 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 09:02:15 -0400 Subject: [PATCH 44/71] use icalcs to strip/add privs (emulating chmod) --- service/test-push.bat | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/service/test-push.bat b/service/test-push.bat index 29d43326..9ba92aeb 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -17,6 +17,23 @@ echo ziti-ci has been retrieved. running: ziti-ci version 2>&1 ziti-ci version 2>&1 ziti-ci configure-git + +set KEY=github_deploy_key +@echo :: # Remove Inheritance :: +Icacls %KEY% /c /t /Inheritance:d + +@echo :: # Set Ownership to Owner :: +Icacls %KEY% /c /t /Grant %UserName%:F + +@echo :: # Remove All Users, except for Owner :: +Icacls %KEY% /c /t /Remove Administrator "Authenticated Users" BUILTIN\Administrators BUILTIN Everyone System Users + +@echo :: # Verify :: +Icacls %KEY% + + + + @echo ssh-keygen -R issued... trying ssh ssh-keygen -R github.com From 2aeecacbfae514764920a2a274a8151480cec18f Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 10:20:32 -0400 Subject: [PATCH 45/71] add a -v to ssh --- service/test-push.bat | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/service/test-push.bat b/service/test-push.bat index 9ba92aeb..e00b90c8 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -32,13 +32,11 @@ Icacls %KEY% /c /t /Remove Administrator "Authenticated Users" BUILTIN\Administr Icacls %KEY% - - @echo ssh-keygen -R issued... trying ssh ssh-keygen -R github.com @echo trying ssh instantly after running ssh-keygen -R github.com -ssh -T -i github_deploy_key github.com 2>&1 +ssh -vT -i github_deploy_key github.com 2>&1 @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 From 50ed6dc349cc03ec70873e030a0aeb700bb1ce1a Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 10:34:52 -0400 Subject: [PATCH 46/71] add the key found using ssh -v... --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index be7c53c9..11968feb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ os: - windows install: + - echo 'nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8' >> $HOME/.ssh/known_hosts + - cat $HOME/.ssh/known_hosts - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; fi before_script: From 82f12b655b58375567d97daff4931edcb2e3846a Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 10:39:51 -0400 Subject: [PATCH 47/71] try TRAVIS_HOME instead of HOME --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11968feb..0cb9c56d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ os: - windows install: - - echo 'nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8' >> $HOME/.ssh/known_hosts - - cat $HOME/.ssh/known_hosts + - echo 'nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8' >> ${TRAVIS_HOME}/.ssh/known_hosts + - cat ${TRAVIS_HOME}/.ssh/known_hosts - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; fi before_script: From b4b0fefe477e8050255e96f538484ee0a721e0d7 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 11:02:16 -0400 Subject: [PATCH 48/71] try, try again --- .travis.yml | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cb9c56d..86ee5b20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,3 @@ -addons: - ssh_known_hosts: - - git.savannah.nongnu.org - - github.com - language: go go: @@ -12,33 +7,21 @@ os: - windows install: - - echo 'nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8' >> ${TRAVIS_HOME}/.ssh/known_hosts - - cat ${TRAVIS_HOME}/.ssh/known_hosts - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja ssh; fi before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: + - echo "about to try to echo a key onto known hosts..." + - echo "nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8" >> ${TRAVIS_HOME}/.ssh/known_hosts + - cat ${TRAVIS_HOME}/.ssh/known_hosts + - echo "getting ziti-ci" + - get-ziti-ci.bat + - echo "ziti-ci has been retrieved. running\:ziti-ci version" + - ziti-ci version + - ziti-ci configure-git + - ssh -vT -i github_deploy_key github.com - export GIT_TRACE=1; service/test-push.bat -after_success: - - git status - - git add service/ziti-tunnel/version.go - - git commit -m "[skip ci] committing from travis" - - git config -l - - git push -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 From dfa4937a8e178ad0098c385a1542fb24c995fc60 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 11:08:44 -0400 Subject: [PATCH 49/71] ssh ->openssh --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 86ee5b20..a432e754 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ os: - windows install: - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja ssh; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja openssh; fi before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) From f72fd6ea2f822a081688b5f95efb2cdb5acb1fc0 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 12:20:32 -0400 Subject: [PATCH 50/71] keep on keepin on --- .travis.yml | 11 +---------- cmon_travis.bat | 10 ++++++++++ service/test-push.bat | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 cmon_travis.bat diff --git a/.travis.yml b/.travis.yml index a432e754..7e4205d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,15 +13,6 @@ before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: - - echo "about to try to echo a key onto known hosts..." - - echo "nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8" >> ${TRAVIS_HOME}/.ssh/known_hosts - - cat ${TRAVIS_HOME}/.ssh/known_hosts - - echo "getting ziti-ci" - - get-ziti-ci.bat - - echo "ziti-ci has been retrieved. running\:ziti-ci version" - - ziti-ci version - - ziti-ci configure-git - - ssh -vT -i github_deploy_key github.com - - export GIT_TRACE=1; service/test-push.bat + - cmon_travis.bat diff --git a/cmon_travis.bat b/cmon_travis.bat new file mode 100644 index 00000000..75c5a2b1 --- /dev/null +++ b/cmon_travis.bat @@ -0,0 +1,10 @@ +echo "about to try to echo a key onto known hosts..." +echo "nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8" >> %USERPROFILE%/.ssh/known_hosts +type %USERPROFILE%/.ssh/known_hosts +echo "getting ziti-ci" +call get-ziti-ci.bat +echo "ziti-ci has been retrieved. running\:ziti-ci version" +ziti-ci version +ziti-ci configure-git +C:\Program Files\OpenSSH-Win64\ssh.exe -vT -i github_deploy_key github.com +ssh -vT -i github_deploy_key github.com \ No newline at end of file diff --git a/service/test-push.bat b/service/test-push.bat index e00b90c8..027af639 100644 --- a/service/test-push.bat +++ b/service/test-push.bat @@ -15,7 +15,7 @@ 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 ziti-ci version 2>&1 -ziti-ci configure-git +ziti-ci configure-git 2>&1 set KEY=github_deploy_key From 5ebf7a4f10c98249ccfa34efc728abce62ccbf8b Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 12:46:32 -0400 Subject: [PATCH 51/71] another update........ --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7e4205d5..824e5947 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,6 @@ before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: - - cmon_travis.bat + - ./cmon_travis.bat From 6f31b39cbe238b58fe5818968cb32ed80f4e2ba5 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 13:04:16 -0400 Subject: [PATCH 52/71] another update........ --- .travis.yml | 2 +- cmon_travis.bat | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 824e5947..9e644303 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ os: - windows install: - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja openssh; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja openssh; echo "echo from install"; refreshenv; 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/cmon_travis.bat b/cmon_travis.bat index 75c5a2b1..d15d7e0f 100644 --- a/cmon_travis.bat +++ b/cmon_travis.bat @@ -1,10 +1,11 @@ -echo "about to try to echo a key onto known hosts..." -echo "nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8" >> %USERPROFILE%/.ssh/known_hosts -type %USERPROFILE%/.ssh/known_hosts -echo "getting ziti-ci" -call get-ziti-ci.bat -echo "ziti-ci has been retrieved. running\:ziti-ci version" -ziti-ci version -ziti-ci configure-git -C:\Program Files\OpenSSH-Win64\ssh.exe -vT -i github_deploy_key github.com -ssh -vT -i github_deploy_key github.com \ No newline at end of file +@echo off +@echo "about to try to echo a key onto known hosts..." 2>&1 +@echo "nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8" >> %USERPROFILE%\.ssh\known_hosts +type %USERPROFILE%\.ssh\known_hosts 2>&1 +@echo "getting ziti-ci" 2>&1 +call get-ziti-ci.bat 2>&1 +@echo "ziti-ci has been retrieved. running\:ziti-ci version" 2>&1 +ziti-ci version 2>&1 +ziti-ci configure-git 2>&1 +"C:\Program Files\OpenSSH-Win64\ssh.exe" -vT -i github_deploy_key github.com 2>&1 +ssh -vT -i github_deploy_key github.com 2>&1 From 1685e75c88823101cbfba5de31168b2b5b667663 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 13:16:12 -0400 Subject: [PATCH 53/71] another update........ --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9e644303..4390903a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ os: - windows install: - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja openssh; echo "echo from install"; refreshenv; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja openssh; echo "echo from install"; fi before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) From 1ace4e79af9a8c085a479cc7557ebc95830d8410 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 13:38:07 -0400 Subject: [PATCH 54/71] still trying to make travis ssh --- cmon_travis.bat | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/cmon_travis.bat b/cmon_travis.bat index d15d7e0f..873e9ac1 100644 --- a/cmon_travis.bat +++ b/cmon_travis.bat @@ -1,11 +1,39 @@ @echo off @echo "about to try to echo a key onto known hosts..." 2>&1 -@echo "nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8" >> %USERPROFILE%\.ssh\known_hosts -type %USERPROFILE%\.ssh\known_hosts 2>&1 +@echo "nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8" >> github_known_hosts 2>&1 + +@echo type'ing github_known_hosts 2>&1 +type github_known_hosts 2>&1 + +@echo using ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile github_known_hosts" github.com to generate github_known_hosts2 +ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile github_known_hosts2" github.com + +@echo type'ing github_known_hosts 2>&1 +type github_known_hosts 2>&1 + +@echo ssh cmd1-a +"C:\Program Files\OpenSSH-Win64\ssh.exe" -vT -o "UserKnownHostsFile github_known_hosts" -i github_deploy_key github.com 2>&1 +@echo ssh cmd1-b +ssh -vT -o "UserKnownHostsFile github_known_hosts" -i github_deploy_key github.com 2>&1 + +@echo mkdir and adding to actual known hosts... 2>&1 +@echo mkdir %USERPROFILE%\.ssh 2>&1 +mkdir %USERPROFILE%\.ssh 2>&1 + +@echo echoing: echo "nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8" onto %USERPROFILE%\.ssh\known_hosts 2>&1 +echo "nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8" >> %USERPROFILE%\.ssh\known_hosts 2>&1 + +@echo typing %USERPROFILE%\.ssh\known_hosts +type %USERPROFILE%\.ssh\known_hosts + +@echo ssh cmd2-a +"C:\Program Files\OpenSSH-Win64\ssh.exe" -vT -i github_deploy_key github.com 2>&1 +@echo ssh cmd2-b +ssh -vT -i github_deploy_key github.com 2>&1 + + @echo "getting ziti-ci" 2>&1 call get-ziti-ci.bat 2>&1 @echo "ziti-ci has been retrieved. running\:ziti-ci version" 2>&1 ziti-ci version 2>&1 -ziti-ci configure-git 2>&1 -"C:\Program Files\OpenSSH-Win64\ssh.exe" -vT -i github_deploy_key github.com 2>&1 -ssh -vT -i github_deploy_key github.com 2>&1 +ziti-ci configure-git 2>&1 \ No newline at end of file From 3649a5e53025cec70e51f1f4fcf7f7e740fc941a Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 13:52:03 -0400 Subject: [PATCH 55/71] still trying --- .travis.yml | 2 +- cmon_travis.bat | 43 ++++++++++++++---------------------------- manual-known-hosts.txt | 1 + 3 files changed, 16 insertions(+), 30 deletions(-) create mode 100644 manual-known-hosts.txt diff --git a/.travis.yml b/.travis.yml index 4390903a..3c1de9c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ os: - windows install: - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja openssh; echo "echo from install"; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; echo "echo from install"; 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/cmon_travis.bat b/cmon_travis.bat index 873e9ac1..d3df4a67 100644 --- a/cmon_travis.bat +++ b/cmon_travis.bat @@ -1,39 +1,24 @@ -@echo off -@echo "about to try to echo a key onto known hosts..." 2>&1 -@echo "nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8" >> github_known_hosts 2>&1 +@echo looking for key using: ssh-keygen -F github.com __1__ 2>&1 +ssh-keygen -F github.com 2>&1 -@echo type'ing github_known_hosts 2>&1 -type github_known_hosts 2>&1 - -@echo using ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile github_known_hosts" github.com to generate github_known_hosts2 -ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile github_known_hosts2" github.com - -@echo type'ing github_known_hosts 2>&1 -type github_known_hosts 2>&1 - -@echo ssh cmd1-a -"C:\Program Files\OpenSSH-Win64\ssh.exe" -vT -o "UserKnownHostsFile github_known_hosts" -i github_deploy_key github.com 2>&1 -@echo ssh cmd1-b -ssh -vT -o "UserKnownHostsFile github_known_hosts" -i github_deploy_key github.com 2>&1 +@echo issuing ssh-keygen -R 2>&1 +ssh-keygen -R github.com 2>&1 @echo mkdir and adding to actual known hosts... 2>&1 @echo mkdir %USERPROFILE%\.ssh 2>&1 mkdir %USERPROFILE%\.ssh 2>&1 -@echo echoing: echo "nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8" onto %USERPROFILE%\.ssh\known_hosts 2>&1 -echo "nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8" >> %USERPROFILE%\.ssh\known_hosts 2>&1 +@echo adding github key: ssh-keyscan -t rsa github.com 2>&1 +ssh-keyscan -t rsa github.com >> %USERPROFILE%\.ssh\known_hosts 2>&1 -@echo typing %USERPROFILE%\.ssh\known_hosts -type %USERPROFILE%\.ssh\known_hosts +@echo typing %USERPROFILE%\.ssh\known_hosts 2>&1 +type %USERPROFILE%\.ssh\known_hosts 2>&1 -@echo ssh cmd2-a -"C:\Program Files\OpenSSH-Win64\ssh.exe" -vT -i github_deploy_key github.com 2>&1 -@echo ssh cmd2-b +@echo looking for key using: ssh-keygen -F github.com - expect to find it this time! 2>&1 +ssh-keygen -F github.com 2>&1 + +@echo test ssh - expect it to work 2>&1 ssh -vT -i github_deploy_key github.com 2>&1 - -@echo "getting ziti-ci" 2>&1 -call get-ziti-ci.bat 2>&1 -@echo "ziti-ci has been retrieved. running\:ziti-ci version" 2>&1 -ziti-ci version 2>&1 -ziti-ci configure-git 2>&1 \ No newline at end of file +@echo test ssh - manual known hosts 2>&1 +ssh -vT -o "UserKnownHostsFile manual-known-hosts.txt" -i github_deploy_key github.com 2>&1 diff --git a/manual-known-hosts.txt b/manual-known-hosts.txt new file mode 100644 index 00000000..23589f29 --- /dev/null +++ b/manual-known-hosts.txt @@ -0,0 +1 @@ +github.com,140.82.113.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== From 2c9f06a1df50c892b545555b1b945602502aa430 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 14:01:11 -0400 Subject: [PATCH 56/71] could this be it? --- cmon_travis.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmon_travis.bat b/cmon_travis.bat index d3df4a67..989ec7d3 100644 --- a/cmon_travis.bat +++ b/cmon_travis.bat @@ -18,7 +18,7 @@ type %USERPROFILE%\.ssh\known_hosts 2>&1 ssh-keygen -F github.com 2>&1 @echo test ssh - expect it to work 2>&1 -ssh -vT -i github_deploy_key github.com 2>&1 +ssh -Tv -i github_deploy_key git@github.com 2>&1 -@echo test ssh - manual known hosts 2>&1 -ssh -vT -o "UserKnownHostsFile manual-known-hosts.txt" -i github_deploy_key github.com 2>&1 +REM @echo test ssh - manual known hosts 2>&1 +REM ssh -vT -o "UserKnownHostsFile manual-known-hosts.txt" -i github_deploy_key github.com 2>&1 From aefaa85964bb6c0890aedd4bff4fbcced9580651 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 14:21:56 -0400 Subject: [PATCH 57/71] ok - surely this will work now right? --- cmon_travis.bat | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/cmon_travis.bat b/cmon_travis.bat index 989ec7d3..5084f289 100644 --- a/cmon_travis.bat +++ b/cmon_travis.bat @@ -1,9 +1,3 @@ -@echo looking for key using: ssh-keygen -F github.com __1__ 2>&1 -ssh-keygen -F github.com 2>&1 - -@echo issuing ssh-keygen -R 2>&1 -ssh-keygen -R github.com 2>&1 - @echo mkdir and adding to actual known hosts... 2>&1 @echo mkdir %USERPROFILE%\.ssh 2>&1 mkdir %USERPROFILE%\.ssh 2>&1 @@ -11,12 +5,15 @@ mkdir %USERPROFILE%\.ssh 2>&1 @echo adding github key: ssh-keyscan -t rsa github.com 2>&1 ssh-keyscan -t rsa github.com >> %USERPROFILE%\.ssh\known_hosts 2>&1 -@echo typing %USERPROFILE%\.ssh\known_hosts 2>&1 -type %USERPROFILE%\.ssh\known_hosts 2>&1 - @echo looking for key using: ssh-keygen -F github.com - expect to find it this time! 2>&1 ssh-keygen -F github.com 2>&1 +@echo "getting ziti-ci" 2>&1 +call get-ziti-ci.bat 2>&1 +@echo "ziti-ci has been retrieved. running\:ziti-ci version" 2>&1 +ziti-ci version 2>&1 +ziti-ci configure-git 2>&1 + @echo test ssh - expect it to work 2>&1 ssh -Tv -i github_deploy_key git@github.com 2>&1 From 7d500bbd86522b49cac82d5aca513183aac1d9de Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 14:57:07 -0400 Subject: [PATCH 58/71] try out the fix in a regular build --- .travis.yml | 23 ++++++++++++++++++++--- service/publish.bat | 21 ++++++++++----------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c1de9c3..ffa548bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,8 @@ +addons: + ssh_known_hosts: + - git.savannah.nongnu.org + - github.com + language: go go: @@ -7,12 +12,24 @@ os: - windows install: - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; echo "echo from install"; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; fi before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: - - ./cmon_travis.bat - + - 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 diff --git a/service/publish.bat b/service/publish.bat index ae2d6fea..e5e68552 100644 --- a/service/publish.bat +++ b/service/publish.bat @@ -5,6 +5,15 @@ set SVC_ROOT_DIR=%~dp0 set /p BUILD_VERSION=<%SVC_ROOT_DIR%..\version IF "%BUILD_VERSION%"=="" GOTO BUILD_VERSION_ERROR +@echo mkdir %USERPROFILE%\.ssh and add github.com to known_hosts... 2>&1 +mkdir %USERPROFILE%\.ssh 2>&1 + +@echo adding github key: ssh-keyscan -t rsa github.com 2>&1 +ssh-keyscan -t rsa github.com >> %USERPROFILE%\.ssh\known_hosts 2>&1 + +@echo looking for key using: ssh-keygen -F github.com - expect to find it now! 2>&1 +ssh-keygen -F github.com 2>&1 + call %SVC_ROOT_DIR%\build.bat SET ACTUAL_ERR=%ERRORLEVEL% if %ACTUAL_ERR% NEQ 0 ( @@ -69,19 +78,9 @@ 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 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 -type ${TRAVIS_HOME}/.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" @echo git commit -m "[ci skip] committing updated version information" complete: %ERRORLEVEL% @echo ======================================================== From 01236dbe991be267a3ca00c53c7ca0b3d7d3f56a Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 19:04:59 +0000 Subject: [PATCH 59/71] [ci skip] committing updated version information --- service/ziti-tunnel/version.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 353659df..d3af4385 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "0.0.29" - Revision = "456b8448ffa8" + Revision = "7d500bbd8652" Branch = "test-git-push" - BuildUser = "Clint D" - BuildDate = "2020-10-13 07:47:31" + BuildUser = "travis" + BuildDate = "2020-10-13 19:00:57" ) From 6c414db4fac8579fde0c277c2df5fd4a74fe005e Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 22:58:38 -0400 Subject: [PATCH 60/71] welp - let's go back to a github action --- .github/workflows/main.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..e155f202 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,32 @@ +name: CI + +on: + push: + branches: + - dev + tags: + - "v*-beta.*" + - "v*-rc.*" + pull_request: + branches: + - "release*" + +env: + BUILD_CONFIG: "Release" + BUILDNUMBER: ${{github.run_number}} + +jobs: + Build: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1 + + - name: Setup NuGet.exe + uses: NuGet/setup-nuget@v1.0.2 + + - name: Build + shell: cmd + run: ./service/publish.bat \ No newline at end of file From 6de535c13da7d569ccaf1bfc4c87a8f5e2f5e40b Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 23:00:09 -0400 Subject: [PATCH 61/71] update branch for PR --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e155f202..3d67a3dd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,6 +10,7 @@ on: pull_request: branches: - "release*" + - "test-git-push" env: BUILD_CONFIG: "Release" From c15930e50d058f5323b2006f062e45716e609207 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 14 Oct 2020 03:06:30 +0000 Subject: [PATCH 62/71] [ci skip] committing updated version information --- service/ziti-tunnel/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index d3af4385..fb939162 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "0.0.29" - Revision = "7d500bbd8652" + Revision = "6de535c13da7" Branch = "test-git-push" BuildUser = "travis" - BuildDate = "2020-10-13 19:00:57" + BuildDate = "2020-10-14 03:02:27" ) From b612351fdbfb62ac351573621ba5c3d9b36aaaa2 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 23:15:19 -0400 Subject: [PATCH 63/71] updates --- .github/workflows/main.yml | 3 +++ .travis.yml | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3d67a3dd..2f690012 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,6 +27,9 @@ jobs: - name: Setup NuGet.exe uses: NuGet/setup-nuget@v1.0.2 + + - name: setup go + uses: actions/setup-go@v2 - name: Build shell: cmd diff --git a/.travis.yml b/.travis.yml index ffa548bc..2a2e7f91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,18 +11,18 @@ go: os: - windows +branches: + except: + - test-git-push + install: - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja advanced-installer; fi 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 - -stages: - - name: deploy - if: branch = master deploy: provider: releases From 4da61666cfb85d9bc84eef06cbbbf8d78b1b9896 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 13 Oct 2020 23:19:58 -0400 Subject: [PATCH 64/71] add setup ninja --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2f690012..80a80ac5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,6 +30,9 @@ jobs: - name: setup go uses: actions/setup-go@v2 + + - name: Setup Ninja + uses: ashutoshvarma/setup-ninja@master - name: Build shell: cmd From 2bdf890d6a1e7a32e45ac8820905a221b389a66d Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 14 Oct 2020 03:22:03 +0000 Subject: [PATCH 65/71] [ci skip] committing updated version information --- service/ziti-tunnel/version.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index fb939162..0aea4f0e 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -20,9 +20,9 @@ package main const ( - Version = "0.0.29" - Revision = "6de535c13da7" + Version = "0.0.30" + Revision = "91fa683d406e" Branch = "test-git-push" BuildUser = "travis" - BuildDate = "2020-10-14 03:02:27" + BuildDate = "2020-10-14 03:18:18" ) From 8382e7674234041ab6ed2f64c9ba336ed2f213e5 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 14 Oct 2020 08:11:32 -0400 Subject: [PATCH 66/71] changes due to PR review --- .github/workflows/{main.yml => main.yml.off} | 0 .travis.yml | 17 +----- manual-known-hosts.txt | 1 - service/test-push.bat | 63 -------------------- 4 files changed, 1 insertion(+), 80 deletions(-) rename .github/workflows/{main.yml => main.yml.off} (100%) delete mode 100644 manual-known-hosts.txt delete mode 100644 service/test-push.bat diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml.off similarity index 100% rename from .github/workflows/main.yml rename to .github/workflows/main.yml.off diff --git a/.travis.yml b/.travis.yml index 2a2e7f91..c67ac646 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,3 @@ -addons: - ssh_known_hosts: - - git.savannah.nongnu.org - - github.com - language: go go: @@ -16,20 +11,10 @@ branches: - test-git-push install: - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja advanced-installer; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; fi 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 - -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 diff --git a/manual-known-hosts.txt b/manual-known-hosts.txt deleted file mode 100644 index 23589f29..00000000 --- a/manual-known-hosts.txt +++ /dev/null @@ -1 +0,0 @@ -github.com,140.82.113.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== diff --git a/service/test-push.bat b/service/test-push.bat deleted file mode 100644 index 027af639..00000000 --- a/service/test-push.bat +++ /dev/null @@ -1,63 +0,0 @@ -@echo off -set CURDIR=%CD% -set SVC_ROOT_DIR=%~dp0 -set ZITI_TUNNEL_WIN_ROOT=%SVC_ROOT_DIR%..\ -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 -ziti-ci version 2>&1 -ziti-ci configure-git 2>&1 - - -set KEY=github_deploy_key -@echo :: # Remove Inheritance :: -Icacls %KEY% /c /t /Inheritance:d - -@echo :: # Set Ownership to Owner :: -Icacls %KEY% /c /t /Grant %UserName%:F - -@echo :: # Remove All Users, except for Owner :: -Icacls %KEY% /c /t /Remove Administrator "Authenticated Users" BUILTIN\Administrators BUILTIN Everyone System Users - -@echo :: # Verify :: -Icacls %KEY% - - -@echo ssh-keygen -R issued... trying ssh -ssh-keygen -R github.com - -@echo trying ssh instantly after running ssh-keygen -R github.com -ssh -vT -i github_deploy_key github.com 2>&1 - -@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 version info generated 2>&1 -@echo --------------------------- 2>&1 -type version 2>&1 -@echo --------------------------- 2>&1 - -@echo ======================================================== 2>&1 -@echo trying git add and commit 2>&1 -@echo ======================================================== 2>&1 - -git add service/ziti-tunnel/version.go 2>&1 -REM git commit -m "[skip ci] updating version" 2>&1 - -@echo ======================================================== 2>&1 -@echo trying git push 2>&1 -@echo ======================================================== 2>&1 -REM git push - -@echo ======================================================== 2>&1 -@echo all done 2>&1 -@echo ======================================================== 2>&1 -sleep 5 From 44489de1fe7d414c221668efaa42ad029f69244b Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 14 Oct 2020 12:12:47 +0000 Subject: [PATCH 67/71] [ci skip] committing updated version information --- service/ziti-tunnel/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 0aea4f0e..dc5a9e1e 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "0.0.30" - Revision = "91fa683d406e" + Revision = "9e00799214b8" Branch = "test-git-push" BuildUser = "travis" - BuildDate = "2020-10-14 03:18:18" + BuildDate = "2020-10-14 12:08:43" ) From 08e47e0b35fba12b1a484889dfda0ddbb759706e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 14 Oct 2020 08:15:16 -0400 Subject: [PATCH 68/71] further refinement based on PR review --- DesktopEdge/MainMenu.xaml.cs | 5 ++--- DesktopEdge/MainWindow.xaml.cs | 3 --- README.md | 1 + cmon_travis.bat | 21 --------------------- 4 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 cmon_travis.bat diff --git a/DesktopEdge/MainMenu.xaml.cs b/DesktopEdge/MainMenu.xaml.cs index b96e4c47..04204d7c 100644 --- a/DesktopEdge/MainMenu.xaml.cs +++ b/DesktopEdge/MainMenu.xaml.cs @@ -201,7 +201,8 @@ namespace ZitiDesktopEdge } private void ShowFeedback(object sender, MouseButtonEventArgs e) { ServiceClient.Client client = (ServiceClient.Client)Application.Current.Properties["ServiceClient"]; - var mailMessage = new MailMessage("", "ziti-support@netfoundry.io"); + var mailMessage = new MailMessage(); + mailMessage.From = new MailAddress("ziti-support@netfoundry.io"); mailMessage.Subject = "Ziti Support"; mailMessage.IsBodyHtml = true; mailMessage.Body = ""; @@ -251,7 +252,6 @@ namespace ZitiDesktopEdge DetachButton.Visibility = Visibility.Collapsed; AttachButton.Visibility = Visibility.Visible; Arrow.Visibility = Visibility.Collapsed; - UIModel.HideOnLostFocus = false; if (OnAttachmentChange != null) { OnAttachmentChange(false); } @@ -269,7 +269,6 @@ namespace ZitiDesktopEdge DetachButton.Visibility = Visibility.Visible; AttachButton.Visibility = Visibility.Collapsed; Arrow.Visibility = Visibility.Visible; - UIModel.HideOnLostFocus = true; if (OnAttachmentChange != null) { OnAttachmentChange(true); } diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs index 86d821bb..ec61e71c 100644 --- a/DesktopEdge/MainWindow.xaml.cs +++ b/DesktopEdge/MainWindow.xaml.cs @@ -74,13 +74,11 @@ namespace ZitiDesktopEdge { } private void MainWindow_Deactivated(object sender, EventArgs e) { - if (UIModel.HideOnLostFocus) { #if DEBUG Debug.WriteLine("debug is enabled - windows pinned"); #else this.Visibility = Visibility.Collapsed; #endif - } } private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) { @@ -104,7 +102,6 @@ namespace ZitiDesktopEdge { _isAttached = false; IdentityMenu.Arrow.Visibility = Visibility.Collapsed; Arrow.Visibility = Visibility.Collapsed; - UIModel.HideOnLostFocus = false; MainMenu.Detach(); this.DragMove(); } diff --git a/README.md b/README.md index d9cc2a81..1ec5b193 100644 --- a/README.md +++ b/README.md @@ -14,3 +14,4 @@ components: * A Windows service which runs as the local system account which creates the TUN as well as manages the Ziti connections * A Windows UWP UI application that allows the interactively logged on user to interact with the Windows service + diff --git a/cmon_travis.bat b/cmon_travis.bat deleted file mode 100644 index 5084f289..00000000 --- a/cmon_travis.bat +++ /dev/null @@ -1,21 +0,0 @@ -@echo mkdir and adding to actual known hosts... 2>&1 -@echo mkdir %USERPROFILE%\.ssh 2>&1 -mkdir %USERPROFILE%\.ssh 2>&1 - -@echo adding github key: ssh-keyscan -t rsa github.com 2>&1 -ssh-keyscan -t rsa github.com >> %USERPROFILE%\.ssh\known_hosts 2>&1 - -@echo looking for key using: ssh-keygen -F github.com - expect to find it this time! 2>&1 -ssh-keygen -F github.com 2>&1 - -@echo "getting ziti-ci" 2>&1 -call get-ziti-ci.bat 2>&1 -@echo "ziti-ci has been retrieved. running\:ziti-ci version" 2>&1 -ziti-ci version 2>&1 -ziti-ci configure-git 2>&1 - -@echo test ssh - expect it to work 2>&1 -ssh -Tv -i github_deploy_key git@github.com 2>&1 - -REM @echo test ssh - manual known hosts 2>&1 -REM ssh -vT -o "UserKnownHostsFile manual-known-hosts.txt" -i github_deploy_key github.com 2>&1 From fbfdf92df9fc5c521cb0aedfc35cfadeef993260 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 14 Oct 2020 12:18:14 +0000 Subject: [PATCH 69/71] [ci skip] committing updated version information --- service/ziti-tunnel/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index dc5a9e1e..f5a260e0 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "0.0.30" - Revision = "9e00799214b8" + Revision = "b02a4e24e74c" Branch = "test-git-push" BuildUser = "travis" - BuildDate = "2020-10-14 12:08:43" + BuildDate = "2020-10-14 12:14:09" ) From c4461a64a49c7a784758738563c5d91b021b100a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 14 Oct 2020 08:30:54 -0400 Subject: [PATCH 70/71] update readme to kick off travis --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 1ec5b193..d9cc2a81 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,3 @@ components: * A Windows service which runs as the local system account which creates the TUN as well as manages the Ziti connections * A Windows UWP UI application that allows the interactively logged on user to interact with the Windows service - From 0c1af3e68927bd98b25923be6ee86a9cb0e769e0 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 14 Oct 2020 12:37:39 +0000 Subject: [PATCH 71/71] [ci skip] committing updated version information --- service/ziti-tunnel/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index f5a260e0..f074489d 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "0.0.30" - Revision = "b02a4e24e74c" + Revision = "04d607f64343" Branch = "test-git-push" BuildUser = "travis" - BuildDate = "2020-10-14 12:14:09" + BuildDate = "2020-10-14 12:33:27" )