Commit Graph

692 Commits

Author SHA1 Message Date
dovholuknf 69be55da4b see if powershell will actually kick off and work 2020-10-16 17:41:59 -04:00
dovholuknf bd25deaa0f add apostrophes around wildcards 2020-10-16 17:24:22 -04:00
dovholuknf b4a2181b6a trying to get an action to work 2020-10-16 17:20:01 -04:00
dovholuknf 6bf7c882b5 add current branch asa test 2020-10-16 17:10:00 -04:00
dovholuknf 4145f1e037 update build related files and add script to update the versions 2020-10-16 16:51:39 -04:00
dovholuknf c6a19dd933 change dns timeout to debug not warning
add String function to intercept

fix bug with intercepts all being treated as DNS records
2020-10-16 11:08:35 -04:00
ziti-ci 64f9c3954b [ci skip] committing updated version information 2020-10-16 04:15:19 +00:00
dovholuknf 7e0e9e3cb3 Merge pull request #137 from openziti/issue-135-add-ip-intercept
Issue 135 add ip intercept
2020-10-16 00:09:00 -04:00
ziti-ci b56b04a02c [ci skip] committing updated version information 2020-10-16 04:06:24 +00:00
dovholuknf 5d5f60b945 closes issue #135 - add ip intercepts 2020-10-15 23:58:18 -04:00
dovholuknf 08c6ea59f4 Merge pull request #136 from openziti/test-release-drafter
another tweak
2020-10-15 17:22:35 -04:00
dovholuknf 34af283126 another tweak 2020-10-15 17:21:32 -04:00
dovholuknf b85c394ca9 update release format 2020-10-15 17:11:21 -04:00
ziti-ci 25399e8af6 [ci skip] committing updated version information 2020-10-15 21:07:30 +00:00
dovholuknf 685f5cb076 Merge commit 'c398d9f7ce1d023fbf504a9e1e25bda580c5da53' into master 2020-10-15 17:01:13 -04:00
ziti-ci e199b95972 [ci skip] committing updated version information 2020-10-15 20:57:15 +00:00
dovholuknf 370398b4f9 Merge pull request #133 from openziti/fix-release-drafter
comment out with
2020-10-15 16:56:55 -04:00
dovholuknf c398d9f7ce comment out with 2020-10-15 16:55:45 -04:00
dovholuknf d48f4e84f5 Merge pull request #132 from openziti/maint-add-installer
add advanced installer file to repo and add release-drafter
2020-10-15 16:51:29 -04:00
dovholuknf 9b783f1a44 closes #131 - add advanced installer file to repo
also adds release-drafter and bumps the version file
2020-10-15 16:49:58 -04:00
ziti-ci 23c4046e8d [ci skip] committing updated version information 2020-10-15 17:11:38 +00:00
dovholuknf a182679121 Merge pull request #127 from openziti/release-0.0.30
Release 0.0.30
1.2.9
2020-10-15 13:00:22 -04:00
ziti-ci 0c8544699a [ci skip] committing updated version information 2020-10-14 13:11:15 +00:00
dovholuknf 19e0a6b080 update travis - hopefully for the final time 2020-10-14 09:04:46 -04:00
ziti-ci c6183abce5 [ci skip] committing updated version information 2020-10-14 13:04:08 +00:00
dovholuknf 5f6704b1e6 Merge branch 'release-0.0.30' of github.com:openziti/desktop-edge-win into release-0.0.30 2020-10-14 08:57:32 -04:00
ziti-ci 406660a5d4 [ci skip] committing updated version information 2020-10-14 12:56:54 +00:00
dovholuknf dbe8b2974a update .travis.yml to ONLY build master branch so that PRs only build 2020-10-14 08:53:30 -04:00
dovholuknf 83b63dd059 Merge branch 'release-0.0.30' of github.com:openziti/desktop-edge-win into release-0.0.30 2020-10-14 08:51:00 -04:00
dovholuknf ff45bc12cc update readme to trigger travis. travis checks are not showing on PR? 2020-10-14 08:50:54 -04:00
ziti-ci 4de5588532 [ci skip] committing updated version information 2020-10-14 12:45:46 +00:00
dovholuknf 442dc4fa41 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
2020-10-14 08:39:43 -04:00
ziti-ci 0c1af3e689 [ci skip] committing updated version information 2020-10-14 12:37:39 +00:00
dovholuknf c4461a64a4 update readme to kick off travis 2020-10-14 08:30:54 -04:00
ziti-ci fbfdf92df9 [ci skip] committing updated version information 2020-10-14 12:18:14 +00:00
dovholuknf ad070215fc Merge branch 'test-git-push' of github.com:openziti/desktop-edge-win into test-git-push 2020-10-14 08:15:24 -04:00
dovholuknf 08e47e0b35 further refinement based on PR review 2020-10-14 08:15:16 -04:00
ziti-ci 44489de1fe [ci skip] committing updated version information 2020-10-14 12:12:47 +00:00
dovholuknf 8382e76742 changes due to PR review 2020-10-14 08:11:32 -04:00
ziti-ci 3a213b820e Merge branch 'test-git-push' of github.com:openziti/desktop-edge-win into test-git-push 2020-10-14 08:05:39 -04:00
ziti-ci 8424bbb98f Merge branch 'release-0.0.30' into test-git-push 2020-10-14 08:05:26 -04:00
ziti-ci 2bdf890d6a [ci skip] committing updated version information 2020-10-14 03:22:03 +00:00
ziti-ci 4da61666cf add setup ninja 2020-10-13 23:19:58 -04:00
ziti-ci 59b5349df4 Merge branch 'test-git-push' of github.com:openziti/desktop-edge-win into test-git-push 2020-10-13 23:15:26 -04:00
ziti-ci b612351fdb updates 2020-10-13 23:15:19 -04:00
ziti-ci c15930e50d [ci skip] committing updated version information 2020-10-14 03:06:30 +00:00
ziti-ci 6de535c13d update branch for PR 2020-10-13 23:00:09 -04:00
ziti-ci f327a06355 Merge branch 'test-git-push' of github.com:openziti/desktop-edge-win into test-git-push 2020-10-13 22:58:44 -04:00
ziti-ci 6c414db4fa welp - let's go back to a github action 2020-10-13 22:58:38 -04:00
ziti-ci 01236dbe99 [ci skip] committing updated version information 2020-10-13 19:04:59 +00:00