Merge pull request #128 from openziti/test-git-push

Finally got travis to allow git push by creating the %USERPROFILE%\.ssh folder in our build script

.github/workflows/main.yml.off

@@ -0,0 +1,39 @@
+name: CI
+
+on:
+  push:
+    branches: 
+      - dev
+    tags:
+      - "v*-beta.*"
+      - "v*-rc.*"
+  pull_request:
+    branches: 
+      - "release*"
+      - "test-git-push"
+
+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: setup go
+      uses: actions/setup-go@v2
+      
+    - name: Setup Ninja
+      uses: ashutoshvarma/setup-ninja@master
+
+    - name: Build
+      shell: cmd
+      run: ./service/publish.bat

.travis.yml

@@ -1,8 +1,3 @@
-addons:
-  ssh_known_hosts:
-    - git.savannah.nongnu.org
-    - github.com
-
 language: go
 
 go:
@@ -11,6 +6,10 @@ go:
 os:
   - windows
 
+branches:
+  except:
+    - test-git-push
+
 install:
   - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; fi
 
@@ -19,17 +18,3 @@ before_script:
 
 script:
   - 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

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
 
-

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 ========================================================

service/ziti-tunnel/version.go

@@ -20,9 +20,9 @@
 package main
 
 const (
-	Version   = "0.0.25"
-	Revision  = "6d78cc92a261"
-	Branch    = "master"
-	BuildUser = "Clint D"
-	BuildDate = "2020-09-22 17:11:28"
+	Version   = "0.0.30"
+	Revision  = "04d607f64343"
+	Branch    = "test-git-push"
+	BuildUser = "travis"
+	BuildDate = "2020-10-14 12:33:27"
 )