From a7e3b0fe9493666c33da559d57ced35d33d0bcf3 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 1 Nov 2020 17:13:34 -0500 Subject: [PATCH 1/6] try testing for key using a full path --- Installer/build.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index b395b9a1..8e30e37e 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -47,11 +47,11 @@ if($gituser -eq "ziti-ci") { git add DesktopEdge/Properties/AssemblyInfo.cs git add ZitiUpdateService/Properties/AssemblyInfo.cs git add Installer/ZitiDesktopEdge.aip - if(Test-Path .\github_deploy_key) { + if(Test-Path ${scriptPath}\..\github_deploy_key) { git commit -m "[ci skip] committing updated installer file" 2>&1 git push } else { - echo "detected ziti-zi - but no gh_deploy_key so no commit and no push" + echo "detected ziti-ci - but no gh_deploy_key so no commit and no push" } } else { echo "detected user [${gituser}] which is not ziti-ci - skipping installer commit" From 26d984810bcd8e2b808d05c8080bb8d6f9324373 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 1 Nov 2020 17:29:25 -0500 Subject: [PATCH 2/6] trying to get the push to work --- Installer/build.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 8e30e37e..7ce90aaa 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -40,14 +40,15 @@ echo "Assembling installer using AdvancedInstaller at: $ADVINST $action $ADVPROJ & $ADVINST $action $ADVPROJECT $gituser=$(git config user.name) -$ghkey=$(ls github_deploy_key) if($gituser -eq "ziti-ci") { echo "yes ziti-ci" git add service/ziti-tunnel/version.go git add DesktopEdge/Properties/AssemblyInfo.cs git add ZitiUpdateService/Properties/AssemblyInfo.cs git add Installer/ZitiDesktopEdge.aip - if(Test-Path ${scriptPath}\..\github_deploy_key) { + + if(Test-Path ${scriptPath}\..\service\github_deploy_key) { + copy $scriptPath\..\service\github_deploy_key . git commit -m "[ci skip] committing updated installer file" 2>&1 git push } else { From b823251f555f301306edcb3241b1621cb9cbd127 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 1 Nov 2020 19:03:29 -0500 Subject: [PATCH 3/6] commit anyway... --- Installer/build.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 7ce90aaa..907ae717 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -49,11 +49,11 @@ if($gituser -eq "ziti-ci") { if(Test-Path ${scriptPath}\..\service\github_deploy_key) { copy $scriptPath\..\service\github_deploy_key . - git commit -m "[ci skip] committing updated installer file" 2>&1 - git push } else { - echo "detected ziti-ci - but no gh_deploy_key so no commit and no push" + echo "detected ziti-ci - but no gh_deploy_key. push may fail" } + git commit -m "[ci skip] committing updated installer file" 2>&1 + git push 2>&1 } else { echo "detected user [${gituser}] which is not ziti-ci - skipping installer commit" } From 83b58195b43a11bb822b640d57e8a9092d9e2c93 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 2 Nov 2020 00:12:35 +0000 Subject: [PATCH 4/6] [ci skip] committing updated installer file --- Installer/ZitiDesktopEdge.aip | 4 ++-- ZitiUpdateService/Properties/AssemblyInfo.cs | 4 ++-- service/ziti-tunnel/version.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index e87b60bf..89431f4d 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -22,10 +22,10 @@ - + - + diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index e3ab62af..89d4a4a5 100644 --- a/ZitiUpdateService/Properties/AssemblyInfo.cs +++ b/ZitiUpdateService/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.2.14.0")] +[assembly: AssemblyFileVersion("1.2.14.0")] diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index efb1a3e8..ce87b13a 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.14" - Revision = "505ce9e72030" + Revision = "b823251f555f" Branch = "release-1.2.14" BuildUser = "" - BuildDate = "2020-11-01 21:12:13" + BuildDate = "2020-11-02 00:07:24" ) From 1a7a44e97cd98117c549ea571f36dea3697e7176 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 2 Nov 2020 00:27:59 +0000 Subject: [PATCH 5/6] [ci skip] committing updated installer file --- 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 ce87b13a..c7e26425 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.14" - Revision = "b823251f555f" - Branch = "release-1.2.14" + Revision = "8b256c11d932" + Branch = "master" BuildUser = "" - BuildDate = "2020-11-02 00:07:24" + BuildDate = "2020-11-02 00:21:29" ) From 381874b5a104ae8e77a7816efa80309d2e8f31dc Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 2 Nov 2020 00:43:24 +0000 Subject: [PATCH 6/6] [ci skip] committing updated installer file --- Installer/ZitiDesktopEdge.aip | 4 ++-- ZitiUpdateService/Properties/AssemblyInfo.cs | 4 ++-- service/ziti-tunnel/version.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 89431f4d..ca6b7e45 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -22,10 +22,10 @@ - + - + diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index 89d4a4a5..c0d20486 100644 --- a/ZitiUpdateService/Properties/AssemblyInfo.cs +++ b/ZitiUpdateService/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.14.0")] -[assembly: AssemblyFileVersion("1.2.14.0")] +[assembly: AssemblyVersion("1.3.0.0")] +[assembly: AssemblyFileVersion("1.3.0.0")] diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 78cc371c..649c854b 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.3.0" - Revision = "dc93c9686722" + Revision = "9facdf76644f" Branch = "release-1.3.0" BuildUser = "" - BuildDate = "2020-10-31 20:20:13" + BuildDate = "2020-11-02 00:38:12" )