From b85c394ca9b738f1c2081e08beae7be2f4855219 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Thu, 15 Oct 2020 17:11:21 -0400 Subject: [PATCH 001/202] update release format --- .github/release-drafter.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index f62c63f7..28fbe665 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -14,7 +14,7 @@ categories: label: 'chore' - title: 'Dependencies' label: 'dependencies' -change-template: '- $TITLE @$AUTHOR (#$NUMBER)' +change-template: '- $TITLE [#$NUMBER]' change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks. version-resolver: major: @@ -27,6 +27,8 @@ version-resolver: labels: - 'patch' default: patch +exclude-labels: + - 'changelog-ignore' template: | ## Changes $CHANGES From 34af28312641e6d66c4cd3b54a72651fc29c2e6b Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Thu, 15 Oct 2020 17:21:32 -0400 Subject: [PATCH 002/202] another tweak --- .github/release-drafter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 28fbe665..ae11aac5 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -10,7 +10,7 @@ categories: - 'fix' - 'bugfix' - 'bug' - - title: 'í·°Maintenance' + - title: 'Maintenance' label: 'chore' - title: 'Dependencies' label: 'dependencies' From 5d5f60b945d16f79a21df9bb8eaf8d60aff498e2 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Thu, 15 Oct 2020 23:58:18 -0400 Subject: [PATCH 003/202] closes issue #135 - add ip intercepts --- service/cziti/cziti-cli/main.go | 126 --------------------------- service/cziti/dns-proxy.go | 1 - service/cziti/dns.go | 86 ++++++++++++------ service/cziti/sdk.go | 2 +- service/set-env.bat | 4 + service/ziti-tunnel/api/api.go | 29 ++++++ service/ziti-tunnel/main.go | 4 +- service/ziti-tunnel/service/ipc.go | 8 +- service/ziti-tunnel/service/state.go | 66 +++++++++----- 9 files changed, 144 insertions(+), 182 deletions(-) delete mode 100644 service/cziti/cziti-cli/main.go create mode 100644 service/set-env.bat create mode 100644 service/ziti-tunnel/api/api.go diff --git a/service/cziti/cziti-cli/main.go b/service/cziti/cziti-cli/main.go deleted file mode 100644 index 8191b9c3..00000000 --- a/service/cziti/cziti-cli/main.go +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package main - -import "C" -import ( - "bufio" - "errors" - "fmt" - "os" - "strconv" - "strings" - "github.com/openziti/desktop-edge-win/service/cziti" -) - -func main() { - cziti.Start() - - fmt.Println("welcome to cziti-cli testing") - fmt.Println("----------------------------") - fmt.Println() - - reader := bufio.NewReader(os.Stdin) - for { - fmt.Print("-> ") - text, _ := reader.ReadString('\n') - - text = strings.TrimSpace(text) - cmd := strings.Split(text, " ") - - if f, found := commands[cmd[0]]; found { - err := f(cmd[1:]) - if err != nil { - _, _ = fmt.Fprintf(os.Stderr, "error: %v", err) - } - fmt.Println() - } else { - fmt.Printf("command `%s' is not found\n", cmd[0]) - } - } -} - -var commands = make(map[string]func([]string) error) - -func init() { - commands["quit"] = quit - commands["help"] = help - commands["list"] = list - commands["load"] = load - commands["show-services"] = showServices -} - -func showServices(args []string) error { - if len(args) == 0 { - return errors.New("select context") - } - - idx, err := strconv.Atoi(args[0]) - if err != nil { - return err - } - - if idx >= len(contexts) { - return errors.New("invalid reference") - } - - ctx := contexts[idx] - - fmt.Printf("services available to %s@%s\n", ctx.Name(), ctx.Controller()) - ctx.Services.Range(func(key interface{}, value interface{}) bool { - fmt.Printf("\t%v=%v\n", key, value) - return true - }) - return nil -} - -func quit(_ []string) error { - cziti.Stop() - os.Exit(0) - return nil -} - -func help(_ []string) error { - fmt.Println("available commands:") - for k, _ := range commands { - fmt.Println("\t", k) - } - return nil -} - -var contexts []*cziti.CZitiCtx - -func load(args []string) error { - if len(args) == 0 { - return fmt.Errorf("path to configfile required") - } - - ctx := cziti.LoadZiti(args[0]) - fmt.Printf("successfully loaded %s@%s\n", ctx.Name(), ctx.Controller()) - contexts = append(contexts, ctx) - - return nil -} - -func list(args []string) error { - fmt.Println("loaded ziti identities:") - for i, c := range contexts { - fmt.Printf("\t%d:\t%s@%s\n", i, c.Name(), c.Controller()) - } - return nil -} diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index c081e2e7..ca305cfc 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -259,7 +259,6 @@ func runDNSproxy(dnsServers []string) { b, _ := pr.req.Pack() for _, proxy := range dnsUpstreams { if _, err := proxy.Write(b); err != nil { - //TODO: if this happens -does this mean the next dns server is not available? _ = proxy.Close() //first thing - close the proxy connection diff --git a/service/cziti/dns.go b/service/cziti/dns.go index 43c4a030..92b98557 100644 --- a/service/cziti/dns.go +++ b/service/cziti/dns.go @@ -21,8 +21,7 @@ import "C" import ( "encoding/binary" "fmt" - "github.com/openziti/desktop-edge-win/service/ziti-tunnel/constants" - + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/api" "net" "strings" "sync" @@ -44,12 +43,19 @@ type dnsImpl struct { cidr uint32 ipCount uint32 - serviceMap map[string]ctxService + serviceMap map[intercept]ctxService // dnsName -> ip address hostnameMap map[string]ctxIp // ipv4 -> dnsName //ipMap map[uint32]string + tun api.DesktopEdgeIface +} + +type intercept struct { + host string + port uint16 + isIp bool } type ctxIp struct { @@ -78,20 +84,28 @@ func normalizeDnsName(dnsName string) string { // RegisterService will return the next ip address in the configured range. If the ip address is not // assigned to a hostname an error will also be returned indicating why. func (dns *dnsImpl) RegisterService(svcId string, dnsNameToReg string, port uint16, ctx *CZitiCtx, svcName string) (net.IP, error) { - log.Infof("adding DNS entry for service name %s@%s:%d", svcName, dnsNameToReg, port) - DnsInit(constants.Ipv4ip, constants.Ipv4DefaultMask) - dnsName := normalizeDnsName(dnsNameToReg) - key := fmt.Sprint(dnsName, ':', port) + var ipOrDnsName string - var ip net.IP + //check to see if host is an ip address - if so we want to intercept the ip. otherwise treat host as a host + //name and register it in dns, obtain an ip and all that... + ip := net.ParseIP(dnsNameToReg) + + int := intercept{isIp: false} + if ip == nil { + int.host = normalizeDnsName(dnsNameToReg) + } else { + int.host = ip.String() + } + + log.Infof("adding DNS for %s. service name %s@%s.", dnsNameToReg, svcName, int) currentNetwork := C.GoString(ctx.Options.controller) // check to see if the hostname is mapped... - if foundIp, found := dns.hostnameMap[dnsName]; found { + if foundIp, found := dns.hostnameMap[ipOrDnsName]; found { ip = foundIp.ip // now check to see if the host *and* port are mapped... - if foundContext, found := dns.serviceMap[key]; found { + if foundContext, found := dns.serviceMap[int]; found { if foundIp.network != currentNetwork { // means the host:port are mapped to some other *identity* already. that's an invalid state return ip, fmt.Errorf("service mapping conflict for service name %s. %s:%d in %s is already mapped by another identity in %s", svcName, dnsNameToReg, port, currentNetwork, foundIp.network) @@ -103,10 +117,10 @@ func (dns *dnsImpl) RegisterService(svcId string, dnsNameToReg string, port uint // while the host *AND* port are not used - the hostname is. // need to increment the refcounter of how many service use this hostname foundContext.count ++ - log.Debugf("DNS mapping for %s used by another service. total services using %s = %d", dnsNameToReg, dnsNameToReg, foundContext.count) + log.Debugf("DNS mapping used by another service. total services using %s = %d", dnsNameToReg, foundContext.count) } else { // good - means the service can be mapped - dns.serviceMap[key] = ctxService{ + dns.serviceMap[int] = ctxService{ ctx: ctx, name: svcName, serviceId: svcId, @@ -115,17 +129,30 @@ func (dns *dnsImpl) RegisterService(svcId string, dnsNameToReg string, port uint } } else { // if not used at all - map it - nextAddr := dns.cidr | atomic.AddUint32(&dns.ipCount, 1) - ip = make(net.IP, 4) - binary.BigEndian.PutUint32(ip, nextAddr) + if int.isIp { + err := dns.tun.AddRoute( + net.IPNet{IP: ip, Mask: net.IPMask{255, 255, 255, 255}}, + net.IP{0,0,0,0}, + 1) + if err != nil { + log.Errorf("Unexpected error adding a route to %s: %v", ipOrDnsName, err) + } else { + log.Infof("adding route for ip:%s", ipOrDnsName) + } + } else { + nextAddr := dns.cidr | atomic.AddUint32(&dns.ipCount, 1) + ip = make(net.IP, 4) + binary.BigEndian.PutUint32(ip, nextAddr) - log.Infof("mapping hostname %s to ip %s", dnsNameToReg, ip.String()) - dns.hostnameMap[dnsName] = ctxIp { - ip: ip, - ctx: ctx, - network: currentNetwork, + log.Infof("mapping hostname %s to ip %s", dnsNameToReg, ip.String()) + dns.hostnameMap[ipOrDnsName] = ctxIp { + ip: ip, + ctx: ctx, + network: currentNetwork, + } } - dns.serviceMap[key] = ctxService{ + + dns.serviceMap[int] = ctxService{ ctx: ctx, name: svcName, serviceId: svcId, @@ -143,13 +170,19 @@ func (dns *dnsImpl) Resolve(toResolve string) net.IP { func (dns *dnsImpl) DeregisterService(ctx *CZitiCtx, name string) { log.Debugf("DEREG SERVICE: before for loop") - for k, sc := range dns.serviceMap { + for int, sc := range dns.serviceMap { log.Debugf("DEREG SERVICE: iterating sc.ctx=ctx %p=%p, sc.name=name %s=%s", sc.ctx, ctx, sc.name, name) if sc.ctx == ctx && sc.name == name { sc.count -- if sc.count < 1 { - log.Infof("removing service named %s from DNS mapping known as %s", name, k) - delete(dns.serviceMap, k) + log.Infof("removing service named %s from DNS mapping known as %s", name, int) + if int.isIp { + err := dns.tun.RemoveRoute(net.IPNet{IP: net.ParseIP(int.host)}, net.IP{0, 0, 0, 0}) + if err != nil { + log.Warnf("Unexpected error removing route for %s", int.host) + } + } + delete(dns.serviceMap, int) } else { // another service is using the mapping - can't remove it yet so decrement log.Debugf("cannot remove dns mapping for %s yet - %d other services still use this hostname", name, sc.count) @@ -179,14 +212,15 @@ func (this *dnsImpl) GetService(ip net.IP, port uint16) (*CZitiCtx, string, erro */ } -func DnsInit(ip string, maskBits int) { +func DnsInit(tun api.DesktopEdgeIface, ip string, maskBits int) { initOnce.Do(func() { - DNS.serviceMap = make(map[string]ctxService) + DNS.serviceMap = make(map[intercept]ctxService) //DNS.ipMap = make(map[uint32]string) DNS.hostnameMap = make(map[string]ctxIp) i := net.ParseIP(ip).To4() mask := net.CIDRMask(maskBits, 32) DNS.cidr = binary.BigEndian.Uint32(i) & binary.BigEndian.Uint32(mask) DNS.ipCount = 2 + DNS.tun = tun }) } diff --git a/service/cziti/sdk.go b/service/cziti/sdk.go index 28b33bf5..956a7f42 100644 --- a/service/cziti/sdk.go +++ b/service/cziti/sdk.go @@ -178,7 +178,7 @@ func serviceCB(ziti_ctx C.ziti_context, service *C.ziti_service, status C.int, t ZitiContext: ctx, } } else { - log.Warnf("could not remove service? service not found with id: %s, name: %s in context %d", service.id, service.name, &ctx) + log.Warnf("could not remove service? service not found with id: %s, name: %s in context %d", svcId, name, &ctx) } } else if status == C.ZITI_OK { //first thing's first - determine if the service is already in this runtime diff --git a/service/set-env.bat b/service/set-env.bat new file mode 100644 index 00000000..db03d590 --- /dev/null +++ b/service/set-env.bat @@ -0,0 +1,4 @@ +set SVC_ROOT_DIR=%~dp0 +SET TUNNELER_SDK_DIR=%SVC_ROOT_DIR%deps\ziti-tunneler-sdk-c\ +SET CGO_CFLAGS=-DNOGDI -I %TUNNELER_SDK_DIR%install\include +SET CGO_LDFLAGS=-L %TUNNELER_SDK_DIR%install\lib \ No newline at end of file diff --git a/service/ziti-tunnel/api/api.go b/service/ziti-tunnel/api/api.go new file mode 100644 index 00000000..2332ded7 --- /dev/null +++ b/service/ziti-tunnel/api/api.go @@ -0,0 +1,29 @@ +package api + +import "net" + +type DesktopEdgeIface interface { + AddRoute(destination net.IPNet, nextHop net.IP, metric uint32) error + RemoveRoute(destination net.IPNet, nextHop net.IP) error + + InterceptDNS() + ReleaseDNS() + + InterceptIP() + ReleaseIP() + + Close() +} + +type DesktopEdgeManager interface { + AddIdentity() + RemoveIdentity() + Status() + TunnelState() + IdentityToggle() + SetLogLevel() + Debug() + SaveState() + CreateTun() + FindIdentity() +} \ No newline at end of file diff --git a/service/ziti-tunnel/main.go b/service/ziti-tunnel/main.go index ac96141f..9a4b0fb9 100644 --- a/service/ziti-tunnel/main.go +++ b/service/ziti-tunnel/main.go @@ -1,3 +1,5 @@ +// +build windows + /* * Copyright NetFoundry, Inc. * @@ -14,8 +16,6 @@ * limitations under the License. * */ - -// +build windows package main import ( diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go index 037c01bb..79e8f8b3 100644 --- a/service/ziti-tunnel/service/ipc.go +++ b/service/ziti-tunnel/service/ipc.go @@ -229,7 +229,7 @@ func (p *Pipes) shutdownConnections() { } func initialize(ipv4 string, ipv4mask int) error { - err := rts.CreateTun(ipv4, ipv4mask) + err := rts.CreateTun(ipv4, 32) if err != nil { return err } @@ -314,7 +314,7 @@ func serveIpc(conn net.Conn) { events.broadcast <- dto.TunnelStatusEvent{ StatusEvent: dto.StatusEvent{Op: "status"}, Status: rts.ToStatus(), - ApiVersion: API_VERSION, + ApiVersion: API_VERSION, } done := make(chan struct{}, 8) @@ -523,7 +523,7 @@ func serveEvents(conn net.Conn) { err := o.Encode( dto.TunnelStatusEvent{ StatusEvent: dto.StatusEvent{Op: "status"}, Status: rts.ToStatus(), - ApiVersion: API_VERSION, + ApiVersion: API_VERSION, }) if err != nil { @@ -795,7 +795,7 @@ func removeIdentity(out *json.Encoder, fingerprint string) { return } - rts.RemoveByIdentity(*id) + rts.RemoveByFingerprint(fingerprint) //remove the file from the filesystem - first verify it's the proper file log.Debug("removing identity file for fingerprint %s at %s", id.FingerPrint, id.Path()) diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go index d7a3aa90..c88b123a 100644 --- a/service/ziti-tunnel/service/state.go +++ b/service/ziti-tunnel/service/state.go @@ -59,14 +59,6 @@ func (t *RuntimeState) Find(fingerprint string) (int, *dto.Identity) { return len(t.state.Identities), nil } -func (t *RuntimeState) RemoveByIdentity(id dto.Identity) { - t.RemoveByFingerprint(id.FingerPrint) -} - -func (t *RuntimeState) FindByIdentity(id dto.Identity) (int, *dto.Identity) { - return t.Find(id.FingerPrint) -} - func (t *RuntimeState) SaveState() { // overwrite file if it exists _ = os.MkdirAll(config.Path(), 0644) @@ -195,7 +187,7 @@ func (t *RuntimeState) CreateTun(ipv4 string, ipv4mask int) error { } log.Info("routing applied") - cziti.DnsInit(ipv4, ipv4mask) + cziti.DnsInit(&rts, ipv4, ipv4mask) cziti.Start() _, err = cziti.HookupTun(tunDevice, dns) if err != nil { @@ -242,18 +234,6 @@ func noZiti() bool { return v } -func (t *RuntimeState) Close() { - if t.tun != nil { - tu := *t.tun - err := tu.Close() - if err != nil { - log.Fatalf("problem closing tunnel!") - } - } else { - log.Warn("unexpected situation. the TUN was null? ") - } -} - func (t *RuntimeState) LoadConfig() { log.Infof("reading config file located at: %s", config.File()) file, err := os.OpenFile(config.File(), os.O_RDONLY, 0644) @@ -309,4 +289,46 @@ func iPv6Disabled() bool { log.Infof("IPv6 has DisabledComponents set to %d. If the service fails to start please report this message", val) return false } -} \ No newline at end of file +} + +func (r *RuntimeState) AddRoute(destination net.IPNet, nextHop net.IP, metric uint32) error { + nativeTunDevice := (*r.tun).(*tun.NativeTun) + luid := winipcfg.LUID(nativeTunDevice.LUID()) + return luid.AddRoute(destination, nextHop, metric) +} + +func (r *RuntimeState) RemoveRoute(destination net.IPNet, nextHop net.IP) error { + nativeTunDevice := (*r.tun).(*tun.NativeTun) + luid := winipcfg.LUID(nativeTunDevice.LUID()) + return luid.DeleteRoute(destination, nextHop) +} + + +func (t *RuntimeState) Close() { + if t.tun != nil { + tu := *t.tun + err := tu.Close() + if err != nil { + log.Fatalf("problem closing tunnel!") + } + } else { + log.Warn("unexpected situation. the TUN was null? ") + } +} + + +func (t *RuntimeState) InterceptDNS() { + panic("implement me") +} + +func (t *RuntimeState) ReleaseDNS() { + panic("implement me") +} + +func (t *RuntimeState) InterceptIP() { + panic("implement me") +} + +func (t *RuntimeState) ReleaseIP() { + panic("implement me") +} From b56b04a02c20c158099eb25d715a95588503c554 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Fri, 16 Oct 2020 04:06:24 +0000 Subject: [PATCH 004/202] [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 d25926e2..3aa6bae5 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.10" - Revision = "685f5cb076f5" - Branch = "master" + Revision = "e1a679368bf7" + Branch = "issue-135-add-ip-intercept" BuildUser = "travis" - BuildDate = "2020-10-15 21:03:33" + BuildDate = "2020-10-16 04:02:47" ) From 64f9c3954b7b5ba43acdf2697e97edac2d0c8fac Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Fri, 16 Oct 2020 04:15:19 +0000 Subject: [PATCH 005/202] [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 3aa6bae5..faca9e6e 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.10" - Revision = "e1a679368bf7" - Branch = "issue-135-add-ip-intercept" + Revision = "6f63c6dcbb37" + Branch = "release-1.2.10" BuildUser = "travis" - BuildDate = "2020-10-16 04:02:47" + BuildDate = "2020-10-16 04:11:24" ) From c6a19dd933253e9455a2f808f4d7c304402db222 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 11:08:35 -0400 Subject: [PATCH 006/202] change dns timeout to debug not warning add String function to intercept fix bug with intercepts all being treated as DNS records --- service/cziti/dns-proxy.go | 2 +- service/cziti/dns.go | 30 ++++++++++++++++-------------- service/ziti-tunnel/service/ipc.go | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index ca305cfc..cf669e16 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -298,7 +298,7 @@ func runDNSproxy(dnsServers []string) { now := time.Now() for k, r := range reqs { if now.After(r.exp) { - log.Warn("a DNS request has expired - enable trace logging and reproduce this issue for more information") + log.Debugf("a DNS request has expired - enable trace logging and reproduce this issue for more information") log.Tracef(" expired DNS req: %s %s", dns.Type(r.req.Question[0].Qtype), r.req.Question[0].Name) delete(reqs, k) diff --git a/service/cziti/dns.go b/service/cziti/dns.go index 92b98557..58bacbc1 100644 --- a/service/cziti/dns.go +++ b/service/cziti/dns.go @@ -57,6 +57,9 @@ type intercept struct { port uint16 isIp bool } +func (i intercept) String() string { + return fmt.Sprintf("%s:%d", i.host, i.port) +} type ctxIp struct { ctx *CZitiCtx @@ -84,28 +87,27 @@ func normalizeDnsName(dnsName string) string { // RegisterService will return the next ip address in the configured range. If the ip address is not // assigned to a hostname an error will also be returned indicating why. func (dns *dnsImpl) RegisterService(svcId string, dnsNameToReg string, port uint16, ctx *CZitiCtx, svcName string) (net.IP, error) { - var ipOrDnsName string - //check to see if host is an ip address - if so we want to intercept the ip. otherwise treat host as a host //name and register it in dns, obtain an ip and all that... ip := net.ParseIP(dnsNameToReg) - int := intercept{isIp: false} + icept := intercept{isIp: false} if ip == nil { - int.host = normalizeDnsName(dnsNameToReg) + icept.host = normalizeDnsName(dnsNameToReg) } else { - int.host = ip.String() + icept.host = ip.String() + icept.isIp = true } - log.Infof("adding DNS for %s. service name %s@%s.", dnsNameToReg, svcName, int) + log.Infof("adding DNS for %s. service name %s@%s", dnsNameToReg, svcName, icept.String()) currentNetwork := C.GoString(ctx.Options.controller) // check to see if the hostname is mapped... - if foundIp, found := dns.hostnameMap[ipOrDnsName]; found { + if foundIp, found := dns.hostnameMap[icept.host]; found { ip = foundIp.ip // now check to see if the host *and* port are mapped... - if foundContext, found := dns.serviceMap[int]; found { + if foundContext, found := dns.serviceMap[icept]; found { if foundIp.network != currentNetwork { // means the host:port are mapped to some other *identity* already. that's an invalid state return ip, fmt.Errorf("service mapping conflict for service name %s. %s:%d in %s is already mapped by another identity in %s", svcName, dnsNameToReg, port, currentNetwork, foundIp.network) @@ -120,7 +122,7 @@ func (dns *dnsImpl) RegisterService(svcId string, dnsNameToReg string, port uint log.Debugf("DNS mapping used by another service. total services using %s = %d", dnsNameToReg, foundContext.count) } else { // good - means the service can be mapped - dns.serviceMap[int] = ctxService{ + dns.serviceMap[icept] = ctxService{ ctx: ctx, name: svcName, serviceId: svcId, @@ -129,15 +131,15 @@ func (dns *dnsImpl) RegisterService(svcId string, dnsNameToReg string, port uint } } else { // if not used at all - map it - if int.isIp { + if icept.isIp { err := dns.tun.AddRoute( net.IPNet{IP: ip, Mask: net.IPMask{255, 255, 255, 255}}, net.IP{0,0,0,0}, 1) if err != nil { - log.Errorf("Unexpected error adding a route to %s: %v", ipOrDnsName, err) + log.Errorf("Unexpected error adding a route to %s: %v", icept.host, err) } else { - log.Infof("adding route for ip:%s", ipOrDnsName) + log.Infof("adding route for ip:%s", icept.host) } } else { nextAddr := dns.cidr | atomic.AddUint32(&dns.ipCount, 1) @@ -145,14 +147,14 @@ func (dns *dnsImpl) RegisterService(svcId string, dnsNameToReg string, port uint binary.BigEndian.PutUint32(ip, nextAddr) log.Infof("mapping hostname %s to ip %s", dnsNameToReg, ip.String()) - dns.hostnameMap[ipOrDnsName] = ctxIp { + dns.hostnameMap[icept.host] = ctxIp { ip: ip, ctx: ctx, network: currentNetwork, } } - dns.serviceMap[int] = ctxService{ + dns.serviceMap[icept] = ctxService{ ctx: ctx, name: svcName, serviceId: svcId, diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go index 79e8f8b3..725a5d18 100644 --- a/service/ziti-tunnel/service/ipc.go +++ b/service/ziti-tunnel/service/ipc.go @@ -229,7 +229,7 @@ func (p *Pipes) shutdownConnections() { } func initialize(ipv4 string, ipv4mask int) error { - err := rts.CreateTun(ipv4, 32) + err := rts.CreateTun(ipv4, ipv4mask) if err != nil { return err } From d13d384e34220474dee555451fcb3a016215299a Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Fri, 16 Oct 2020 15:21:21 +0000 Subject: [PATCH 007/202] [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 faca9e6e..38e8426d 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.10" - Revision = "6f63c6dcbb37" - Branch = "release-1.2.10" + Revision = "302d058d9496" + Branch = "fix-ips-treated-as-dns" BuildUser = "travis" - BuildDate = "2020-10-16 04:11:24" + BuildDate = "2020-10-16 15:17:32" ) From 2f9a9ee35144b09d8b8a8fbebf24847e56b989b5 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 13:23:13 -0400 Subject: [PATCH 008/202] comment out all the tun device/map lookups. only one tun ever exists at this time fix all panics --> log.Panicf eliminate very similar function calls AddIntercept fix issue with lookups not considering the port when looking for duplicate definitions rename DeregisterService to UnregisterService --- service/cziti/ctun.go | 94 ++++++++++++++-------------- service/cziti/dns-proxy.go | 4 +- service/cziti/dns.go | 52 +++++++-------- service/cziti/sdk.go | 14 +++-- service/cziti/windns.go | 4 +- service/ziti-tunnel/service/ipc.go | 9 +-- service/ziti-tunnel/service/state.go | 16 ++--- 7 files changed, 97 insertions(+), 96 deletions(-) diff --git a/service/cziti/ctun.go b/service/cziti/ctun.go index 5b5bb3ff..b47ff40e 100644 --- a/service/cziti/ctun.go +++ b/service/cziti/ctun.go @@ -50,7 +50,6 @@ extern void ZLOG(int level, char* msg); */ import "C" import ( - "errors" "golang.zx2c4.com/wireguard/tun" "io" "net" @@ -78,15 +77,16 @@ type tunnel struct { tunCtx C.tunneler_context } -var devMap = make(map[string]*tunnel) +//var devMap = make(map[string]*tunnel) +var theTun *tunnel -func HookupTun(dev tun.Device, dns []net.IP) (Tunnel, error) { +func HookupTun(dev tun.Device, dns []net.IP) error { log.Debug("in HookupTun ") defer log.Debug("exiting HookupTun") name, err := dev.Name() if err != nil { log.Error(err) - return nil, err + return err } drv := makeDriver(name) @@ -98,7 +98,8 @@ func HookupTun(dev tun.Device, dns []net.IP) (Tunnel, error) { writeQ: make(chan []byte, 64), readQ: make(chan []byte, 64), } - devMap[name] = t + //devMap[name] = t + theTun = t opts := (*C.tunneler_sdk_options)(C.calloc(1, C.sizeof_tunneler_sdk_options)) opts.netif_driver = drv @@ -115,7 +116,7 @@ func HookupTun(dev tun.Device, dns []net.IP) (Tunnel, error) { log.Infof("DNS server - waiting for startup") <-ready log.Infof("DNS server - ready") - return t, nil + return nil } func makeDriver(name string) C.netif_driver { @@ -130,15 +131,14 @@ func makeDriver(name string) C.netif_driver { //export netifWrite func netifWrite(h C.netif_handle, buf unsafe.Pointer, length C.size_t) C.ssize_t { - t, found := devMap[C.GoString(h.id)] + /*t, found := devMap[C.GoString(h.id)] if !found { - panic("should not be here") - return -1 - } + log.Panicf("An unexpected and unrecoverable error has occurred while calling netifWrite") + }*/ b := C.GoBytes(buf, C.int(length)) - t.writeQ <- b + theTun.writeQ <- b return C.ssize_t(len(b)) } @@ -151,29 +151,29 @@ func netifClose(h C.netif_handle) C.int { //export netifSetup func netifSetup(h C.netif_handle, l *C.uv_loop_t, packetCb C.packet_cb, ctx unsafe.Pointer) C.int { - t, found := devMap[C.GoString(h.id)] + /*t, found := devMap[C.GoString(h.id)] if !found { log.Error("should not be here") return -1 - } + }*/ - t.read = (*C.uv_async_t)(C.calloc(1, C.sizeof_uv_async_t)) - C.uv_async_init(l, t.read, C.uv_async_cb(C.readAsync)) - t.read.data = unsafe.Pointer(h) + theTun.read = (*C.uv_async_t)(C.calloc(1, C.sizeof_uv_async_t)) + C.uv_async_init(l, theTun.read, C.uv_async_cb(C.readAsync)) + theTun.read.data = unsafe.Pointer(h) log.Debugf("in netifSetup netif[%s] handle[%p] before", C.GoString(h.id), h) - t.idleR = (*C.uv_prepare_t)(C.calloc(1, C.sizeof_uv_prepare_t)) - C.uv_prepare_init(l, t.idleR) - t.idleR.data = unsafe.Pointer(h) - C.uv_prepare_start(t.idleR, C.uv_prepare_cb(C.readIdle)) + theTun.idleR = (*C.uv_prepare_t)(C.calloc(1, C.sizeof_uv_prepare_t)) + C.uv_prepare_init(l, theTun.idleR) + theTun.idleR.data = unsafe.Pointer(h) + C.uv_prepare_start(theTun.idleR, C.uv_prepare_cb(C.readIdle)) log.Debugf("in netifSetup netif[%s] handle[%p] after", C.GoString(h.id), h) - t.onPacket = packetCb - t.onPacketCtx = ctx - t.loop = l + theTun.onPacket = packetCb + theTun.onPacketCtx = ctx + theTun.loop = l - go t.runWriteLoop() - go t.runReadLoop() + go theTun.runWriteLoop() + go theTun.runReadLoop() return C.int(0) } @@ -181,7 +181,7 @@ func netifSetup(h C.netif_handle, l *C.uv_loop_t, packetCb C.packet_cb, ctx unsa func (t *tunnel) runReadLoop() { mtu, err := t.dev.MTU() if err != nil { - panic(err) + log.Panicf("An unexpected and unrecoverable error has occurred while %s: %v", "getting the MTU", err) } log.Debugf("starting tun read loop mtu=%d", mtu) defer log.Debug("tun read loop is done") @@ -193,7 +193,7 @@ func (t *tunnel) runReadLoop() { //that's fine... return } - panic(err) + log.Panicf("An unexpected and unrecoverable error has occurred while %s: %v", "reading from the tun device", err) } if len(t.readQ) == cap(t.readQ) { @@ -209,21 +209,20 @@ func (t *tunnel) runReadLoop() { //export readIdle func readIdle(idler *C.uv_prepare_t) { - dev := (*C.netif_handle_t)(idler.data) + /*dev := (*C.netif_handle_t)(idler.data) id := C.GoString(dev.id) t, found := devMap[id] if !found { - log.Debug("should not be here id = [%s]", id) - panic(errors.New("where is my tunnel?")) - } + log.Panicf("An unexpected and unrecoverable error has occurred while looking for tun in devMap") + }*/ - np := len(t.readQ) + np := len(theTun.readQ) for i := np; i > 0; i-- { - b := <-t.readQ + b := <-theTun.readQ buf := C.CBytes(b) - C.call_on_packet(buf, C.ssize_t(len(b)), t.onPacket, t.onPacketCtx) + C.call_on_packet(buf, C.ssize_t(len(b)), theTun.onPacket, theTun.onPacketCtx) C.free(buf) } @@ -246,7 +245,7 @@ func (t *tunnel) runWriteLoop() { n, err := t.dev.Write(p, 0) if err != nil { - panic(err) + log.Panicf("An unexpected and unrecoverable error has occurred while %s: %v", "writing to tun device", err) } if n < len(p) { @@ -255,11 +254,21 @@ func (t *tunnel) runWriteLoop() { } } } - +/* func (t *tunnel) AddIntercept(svcId string, service string, host string, port int, ctx unsafe.Pointer) { log.Debugf("about to add intercept for: %s, %s, %d", service, host, port) res := C.ziti_tunneler_intercept_v1(t.tunCtx, ctx, C.CString(svcId), C.CString(service), C.CString(host), C.int(port)) log.Debugf("intercept added: %v", res) +}*/ + +func AddIntercept(svcId string, service string, host string, port int, ctx unsafe.Pointer) { + /*for _, t := range devMap { + log.Debug("adding intercept for: %s, %s, %d", service, host, port) + t.AddIntercept(svcId, service, host, int(port), unsafe.Pointer(ctx)) + } + */ + log.Debugf("about to add intercept for: %s[] at %s:%d", service, svcId, host, port) + _ = C.ziti_tunneler_intercept_v1(theTun.tunCtx, ctx, C.CString(svcId), C.CString(service), C.CString(host), C.int(port)) } type RemoveWG struct { @@ -280,20 +289,13 @@ func remove_intercepts(async *C.uv_async_t) { //c := (*C.char)(async.data) rwg := (*RemoveWG)(async.data) - for _, t := range devMap { + /*for _, t := range devMap { //C.ZLOG(C.INFO, C.CString("bbb on uv thread - inside remove_intercepts")) C.ziti_tunneler_stop_intercepting(t.tunCtx, C.CString(rwg.SvcId)) - } + }*/ + C.ziti_tunneler_stop_intercepting(theTun.tunCtx, C.CString(rwg.SvcId)) //C.ZLOG(C.INFO, C.CString("ccc on uv thread - inside remove_intercepts")) C.uv_close((*C.uv_handle_t)(unsafe.Pointer(async)), C.uv_close_cb(C.free_async)) C.ZLOG(C.INFO, C.CString("on uv thread - completed remove_intercepts")) rwg.Wg.Done() } - -func AddIntercept(svcId string, service string, host string, port uint16, ctx *CZitiCtx) { - for _, t := range devMap { - log.Debug("adding intercept for: %s, %s, %d", service, host, port) - res := C.ziti_tunneler_intercept_v1(t.tunCtx, unsafe.Pointer(ctx.zctx), C.CString(svcId), C.CString(service), C.CString(host), C.int(port)) - log.Debugf("intercept added: %v", res) - } -} diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index cf669e16..d0ae91aa 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -146,7 +146,7 @@ func runListener(ip net.IP, port int, reqch chan dnsreq) { server, err := net.ListenUDP(network, laddr) if err != nil { - panic(err) + log.Panicf("An unexpected and unrecoverable error has occurred while %s: %v", "udp listening on network", err) } for { @@ -159,7 +159,7 @@ func runListener(ip net.IP, port int, reqch chan dnsreq) { break } else { _ = server.Close() - panic(err) + log.Panicf("An unexpected and unrecoverable error has occurred while %s: %v", "reading a udp message", err) } } diff --git a/service/cziti/dns.go b/service/cziti/dns.go index 58bacbc1..a7a8b1a8 100644 --- a/service/cziti/dns.go +++ b/service/cziti/dns.go @@ -43,7 +43,7 @@ type dnsImpl struct { cidr uint32 ipCount uint32 - serviceMap map[intercept]ctxService + serviceMap map[string]ctxService // dnsName -> ip address hostnameMap map[string]ctxIp @@ -72,6 +72,7 @@ type ctxService struct { name string serviceId string count int + icept intercept } func normalizeDnsName(dnsName string) string { @@ -91,15 +92,15 @@ func (dns *dnsImpl) RegisterService(svcId string, dnsNameToReg string, port uint //name and register it in dns, obtain an ip and all that... ip := net.ParseIP(dnsNameToReg) - icept := intercept{isIp: false} + icept := intercept{isIp: false, port: port} if ip == nil { icept.host = normalizeDnsName(dnsNameToReg) } else { icept.host = ip.String() icept.isIp = true } - - log.Infof("adding DNS for %s. service name %s@%s", dnsNameToReg, svcName, icept.String()) + key := icept.String() + log.Infof("adding DNS for %s. service name %s@%s", dnsNameToReg, svcName, key) currentNetwork := C.GoString(ctx.Options.controller) @@ -107,7 +108,7 @@ func (dns *dnsImpl) RegisterService(svcId string, dnsNameToReg string, port uint if foundIp, found := dns.hostnameMap[icept.host]; found { ip = foundIp.ip // now check to see if the host *and* port are mapped... - if foundContext, found := dns.serviceMap[icept]; found { + if foundContext, found := dns.serviceMap[key]; found { if foundIp.network != currentNetwork { // means the host:port are mapped to some other *identity* already. that's an invalid state return ip, fmt.Errorf("service mapping conflict for service name %s. %s:%d in %s is already mapped by another identity in %s", svcName, dnsNameToReg, port, currentNetwork, foundIp.network) @@ -122,12 +123,6 @@ func (dns *dnsImpl) RegisterService(svcId string, dnsNameToReg string, port uint log.Debugf("DNS mapping used by another service. total services using %s = %d", dnsNameToReg, foundContext.count) } else { // good - means the service can be mapped - dns.serviceMap[icept] = ctxService{ - ctx: ctx, - name: svcName, - serviceId: svcId, - count: 1, - } } } else { // if not used at all - map it @@ -153,13 +148,14 @@ func (dns *dnsImpl) RegisterService(svcId string, dnsNameToReg string, port uint network: currentNetwork, } } + } - dns.serviceMap[icept] = ctxService{ - ctx: ctx, - name: svcName, - serviceId: svcId, - count: 1, - } + dns.serviceMap[key] = ctxService{ + ctx: ctx, + name: svcName, + serviceId: svcId, + count: 1, + icept: icept, } return ip, nil @@ -170,21 +166,21 @@ func (dns *dnsImpl) Resolve(toResolve string) net.IP { return dns.hostnameMap[dnsName].ip } -func (dns *dnsImpl) DeregisterService(ctx *CZitiCtx, name string) { - log.Debugf("DEREG SERVICE: before for loop") - for int, sc := range dns.serviceMap { - log.Debugf("DEREG SERVICE: iterating sc.ctx=ctx %p=%p, sc.name=name %s=%s", sc.ctx, ctx, sc.name, name) +func (dns *dnsImpl) UnregisterService(ctx *CZitiCtx, name string) { + log.Debugf("UnregisterService named %s called for controller %s and identity: %s.", name, ctx.Controller(), ctx.Name()) + for key, sc := range dns.serviceMap { if sc.ctx == ctx && sc.name == name { sc.count -- if sc.count < 1 { - log.Infof("removing service named %s from DNS mapping known as %s", name, int) - if int.isIp { - err := dns.tun.RemoveRoute(net.IPNet{IP: net.ParseIP(int.host)}, net.IP{0, 0, 0, 0}) + icept := sc.icept + log.Infof("removing service named %s from DNS mapping known as %s", name, icept) + if icept.isIp { + err := dns.tun.RemoveRoute(net.IPNet{IP: net.ParseIP(icept.host)}, net.IP{0, 0, 0, 0}) if err != nil { - log.Warnf("Unexpected error removing route for %s", int.host) + log.Warnf("Unexpected error removing route for %s", icept.host) } } - delete(dns.serviceMap, int) + delete(dns.serviceMap, key) } else { // another service is using the mapping - can't remove it yet so decrement log.Debugf("cannot remove dns mapping for %s yet - %d other services still use this hostname", name, sc.count) @@ -194,7 +190,7 @@ func (dns *dnsImpl) DeregisterService(ctx *CZitiCtx, name string) { log.Debugf("service context %p does not match event context address %p", sc.ctx, ctx) } } - log.Warnf("DEREG SERVICE: for loop completed. Match was not found for context %p and name %s", ctx, name) + log.Warnf("UnregisterService completed. Match was not found for context %p and name %s", ctx, name) } func (this *dnsImpl) GetService(ip net.IP, port uint16) (*CZitiCtx, string, error) { @@ -216,7 +212,7 @@ func (this *dnsImpl) GetService(ip net.IP, port uint16) (*CZitiCtx, string, erro func DnsInit(tun api.DesktopEdgeIface, ip string, maskBits int) { initOnce.Do(func() { - DNS.serviceMap = make(map[intercept]ctxService) + DNS.serviceMap = make(map[string]ctxService) //DNS.ipMap = make(map[uint32]string) DNS.hostnameMap = make(map[string]ctxIp) i := net.ParseIP(ip).To4() diff --git a/service/cziti/sdk.go b/service/cziti/sdk.go index 956a7f42..a591b2bb 100644 --- a/service/cziti/sdk.go +++ b/service/cziti/sdk.go @@ -170,7 +170,7 @@ func serviceCB(ziti_ctx C.ziti_context, service *C.ziti_service, status C.int, t found, ok := ctx.Services.Load(svcId) if ok { fs := found.(Service) - DNS.DeregisterService(ctx, name) + DNS.UnregisterService(ctx, name) ctx.Services.Delete(svcId) ServiceChanges <- ServiceChange{ Operation: REMOVED, @@ -187,7 +187,7 @@ func serviceCB(ziti_ctx C.ziti_context, service *C.ziti_service, status C.int, t found, ok := ctx.Services.Load(svcId) if ok && found != nil { log.Infof("service with id: %s, name: %s exists. updating service.", service.id, service.name) - DNS.DeregisterService(ctx, name) + DNS.UnregisterService(ctx, name) ctx.Services.Delete(svcId) } else { log.Debugf("service not found with id: %s, name: %s in context %d", svcId, name, &ctx) @@ -199,10 +199,11 @@ func serviceCB(ziti_ctx C.ziti_context, service *C.ziti_service, status C.int, t // int ziti_service_get_config(ziti_service *service, const char *cfg_type, void *cfg, int (*parser)(void *, const char *, size_t)) r := C.ziti_service_get_config(service, C.CString("ziti-tunneler-server.v1"), unsafe.Pointer(&v1Config), (*[0]byte)(C.parse_ziti_server_cfg_v1)) if (r == 0) { - for _, t := range devMap { + /*for _, t := range devMap { log.Debugf("setting up hosted service for service %s on %v:%v", service.name, v1Config.hostname, v1Config.port) C.ziti_tunneler_host_v1(C.tunneler_context(t.tunCtx), unsafe.Pointer(ctx.zctx), service.name, v1Config.protocol, v1Config.hostname, v1Config.port) - } + }*/ + C.ziti_tunneler_host_v1(C.tunneler_context(theTun.tunCtx), unsafe.Pointer(ctx.zctx), service.name, v1Config.protocol, v1Config.hostname, v1Config.port) C.free_ziti_server_cfg_v1(&v1Config) } else { log.Infof("service is bindable but doesn't have config? %s. flags: %v.", name, service.perm_flags) @@ -229,9 +230,10 @@ func serviceCB(ziti_ctx C.ziti_context, service *C.ziti_service, status C.int, t ownsIntercept = false } else { log.Infof("service intercept beginning for service: %s@%s:%d on ip %s", name, host, port, ip.String()) - for _, t := range devMap { + /*for _, t := range devMap { t.AddIntercept(svcId, name, ip.String(), port, unsafe.Pointer(ctx.zctx)) - } + }*/ + AddIntercept(svcId, name, ip.String(), port, unsafe.Pointer(ctx.zctx)) } added := Service{ Name: name, diff --git a/service/cziti/windns.go b/service/cziti/windns.go index 6c15284c..78af9308 100644 --- a/service/cziti/windns.go +++ b/service/cziti/windns.go @@ -55,7 +55,7 @@ func GetConnectionSpecificDomains() []string { err := cmd.Run() if err != nil { - panic(err) + log.Panicf("An unexpected and unrecoverable error has occurred while running the command: %s %v", script, err) } var names []string @@ -85,7 +85,7 @@ func GetUpstreamDNS() []string { err := cmd.Run() if err != nil { - panic(err) + log.Panicf("An unexpected and unrecoverable error has occurred while running the command: %s %v", script, err) } var names []string diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go index 725a5d18..49979d58 100644 --- a/service/ziti-tunnel/service/ipc.go +++ b/service/ziti-tunnel/service/ipc.go @@ -44,6 +44,7 @@ import ( "strings" "sync" "time" + "unsafe" ) type Pipes struct { @@ -279,7 +280,7 @@ func setTunInfo(s *dto.TunnelStatus, ipv4 string, ipv4mask int) { func ipv4MaskString(m []byte) string { if len(m) != 4 { - panic("ipv4Mask: len must be 4 bytes") + log.Panicf("An unexpected and unrecoverable error has occurred. ipv4Mask: len must be 4 bytes") } return fmt.Sprintf("%d.%d.%d.%d", m[0], m[1], m[2], m[3]) @@ -686,7 +687,7 @@ func newIdentity(newId dto.AddIdentity, out *json.Encoder) { err = enrolled.Close() if err != nil { - panic(err) + log.Panicf("An unexpected and unrecoverable error has occurred while %s: %v", "enrolling an identity", err) } newPath := newId.Id.Path() @@ -733,7 +734,7 @@ func connectIdentity(id *dto.Identity) { } else { log.Debugf("id [%s] is already connected - not reconnecting", id.Name) for _, s := range id.Services { - cziti.AddIntercept(s.Id, s.Name, s.InterceptHost, s.InterceptPort, id.ZitiContext) + cziti.AddIntercept(s.Id, s.Name, s.InterceptHost, int(s.InterceptPort), unsafe.Pointer(id.ZitiContext)) } id.Connected = true } @@ -772,7 +773,7 @@ func disconnectIdentity(id *dto.Identity) error { } cziti.RemoveIntercept(rwg) wg.Wait() - cziti.DNS.DeregisterService(id.ZitiContext, s.Name) + cziti.DNS.UnregisterService(id.ZitiContext, s.Name) } id.Connected = false } else { diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go index c88b123a..de340a82 100644 --- a/service/ziti-tunnel/service/state.go +++ b/service/ziti-tunnel/service/state.go @@ -65,7 +65,7 @@ func (t *RuntimeState) SaveState() { cfg, err := os.OpenFile(config.File(), os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) if err != nil { - panic(err) + log.Panicf("An unexpected and unrecoverable error has occurred while %s: %v", "opening the config file", err) } w := bufio.NewWriter(bufio.NewWriter(cfg)) enc := json.NewEncoder(w) @@ -75,7 +75,7 @@ func (t *RuntimeState) SaveState() { err = cfg.Close() if err != nil { - panic(err) + log.Panicf("An unexpected and unrecoverable error has occurred while %s: %v", "closing the config file", err) } log.Debug("state saved") } @@ -189,9 +189,9 @@ func (t *RuntimeState) CreateTun(ipv4 string, ipv4mask int) error { cziti.DnsInit(&rts, ipv4, ipv4mask) cziti.Start() - _, err = cziti.HookupTun(tunDevice, dns) + err = cziti.HookupTun(tunDevice, dns) if err != nil { - panic(err) + log.Panicf("An unrecoverable error has occurred! %v", err) } return nil } @@ -318,17 +318,17 @@ func (t *RuntimeState) Close() { func (t *RuntimeState) InterceptDNS() { - panic("implement me") + log.Panicf("implement me") } func (t *RuntimeState) ReleaseDNS() { - panic("implement me") + log.Panicf("implement me") } func (t *RuntimeState) InterceptIP() { - panic("implement me") + log.Panicf("implement me") } func (t *RuntimeState) ReleaseIP() { - panic("implement me") + log.Panicf("implement me") } From 1c4d2acb78848a4065bee0cb7525901a8a8e5e0f Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Fri, 16 Oct 2020 17:34:05 +0000 Subject: [PATCH 009/202] [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 38e8426d..9b6c8a9d 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.10" - Revision = "302d058d9496" + Revision = "9287c581deab" Branch = "fix-ips-treated-as-dns" BuildUser = "travis" - BuildDate = "2020-10-16 15:17:32" + BuildDate = "2020-10-16 17:29:36" ) From 3d5fc8e2a208099c46e4647ca727938a93ded084 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 13:36:15 -0400 Subject: [PATCH 010/202] fixes issue #129. didn't remove the dns entry from the map --- service/cziti/dns.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/service/cziti/dns.go b/service/cziti/dns.go index a7a8b1a8..fad7c906 100644 --- a/service/cziti/dns.go +++ b/service/cziti/dns.go @@ -179,6 +179,8 @@ func (dns *dnsImpl) UnregisterService(ctx *CZitiCtx, name string) { if err != nil { log.Warnf("Unexpected error removing route for %s", icept.host) } + } else { + delete(dns.hostnameMap, icept.host) } delete(dns.serviceMap, key) } else { From cc419510717e096971a0c8bba7bc4cce203ff673 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Fri, 16 Oct 2020 18:43:18 +0000 Subject: [PATCH 011/202] [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 9b6c8a9d..f19c3115 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.10" - Revision = "9287c581deab" + Revision = "2cc1a23f1ca8" Branch = "fix-ips-treated-as-dns" BuildUser = "travis" - BuildDate = "2020-10-16 17:29:36" + BuildDate = "2020-10-16 18:39:17" ) From 4145f1e037449d7e7b6037ebadd505074c56357e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 16:51:39 -0400 Subject: [PATCH 012/202] update build related files and add script to update the versions --- .github/workflows/installer.build.yml | 22 +++++++++++++ .travis.yml | 5 ++- DesktopEdge/Properties/AssemblyInfo.cs | 8 +++-- Installer/.gitignore | 4 ++- Installer/ZitiDesktopEdge.aip | 22 +++++++++---- Installer/build.ps1 | 45 ++++++++++++++++++++++++++ update-versions.ps1 | 11 +++++++ 7 files changed, 106 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/installer.build.yml create mode 100644 Installer/build.ps1 create mode 100644 update-versions.ps1 diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml new file mode 100644 index 00000000..00ee96ec --- /dev/null +++ b/.github/workflows/installer.build.yml @@ -0,0 +1,22 @@ +name: CI + +on: + push: + branches: + - installer + +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 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index bebe0583..a8c0ac1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,10 @@ go: os: - windows -#branches: //first try at only building PR or branch push - updated to the first if on line 1 above +branches: //first try at only building PR or branch push - updated to the first if on line 1 above + except: + - installer + # only: # - "master" diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index 31ca282c..f7f07fab 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ using System.Windows; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Ziti Desktop Edge")] -[assembly: AssemblyCopyright("Copyright NetFoundry © 2020")] +[assembly: AssemblyCopyright("Copyright NetFoundry © 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,5 +51,7 @@ using System.Windows; // 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.8.0")] -[assembly: AssemblyFileVersion("1.2.8.0")] +[assembly: AssemblyVersion("1.2.10.0")] +[assembly: AssemblyFileVersion("1.2.10.0")] + + diff --git a/Installer/.gitignore b/Installer/.gitignore index 52b1a45c..5edd8264 100644 --- a/Installer/.gitignore +++ b/Installer/.gitignore @@ -1,4 +1,6 @@ ZitiDesktopEdge-cache Output WinSign.p12 -*.p12 \ No newline at end of file +*.p12 +build/ +ziti-tunnel-service.zip diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index d6773ad3..845b031c 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -1,4 +1,4 @@ - + @@ -70,11 +70,11 @@ - - - - - + + + + + @@ -292,3 +292,13 @@ + + + + + + + + + + diff --git a/Installer/build.ps1 b/Installer/build.ps1 new file mode 100644 index 00000000..bf1e9e30 --- /dev/null +++ b/Installer/build.ps1 @@ -0,0 +1,45 @@ +echo "Cleaning previous build folder if it exists" +rm .\build -r -fo + +$x=[xml] @" +$((Invoke-WebRequest https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/maven-metadata.xml).Content) +"@ + +$v = $x.metadata.versioning.release + +$zipUrl = "https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/${v}/ziti-tunnel-win-${v}.zip" + +echo "Downloading zip file " +echo " from: $zipUrl" + +$ProgressPreference = 'SilentlyContinue' +$timeTaken = Measure-Command -Expression { + Invoke-WebRequest $zipUrl -OutFile ziti-tunnel-service.zip +} + +$milliseconds = $timeTaken.TotalMilliseconds +echo " time to download: $milliseconds" +echo "" +echo "unzipping service" + +Expand-Archive -Force -LiteralPath ziti-tunnel-service.zip build\service\ + +Push-Location .. +echo "Updating the version for UI and Installer" +.\update-versions.ps1 +Pop-Location + +echo "Building the UI" +#msbuild ..\DesktopEdge\ZitiDesktopEdge.csproj /property:Configuration=Release + +echo "Building the Wintun installer" +#msbuild ..\ZitiWintunInstaller.sln /p:configuration=Release + +$CMD = "$ENV:ADVINST_EXE" +$arg1 = '/build' +$arg2 = '.\ZitiDesktopEdge.aip' + +echo "Assembling installer using AdvancedInstaller at: $CMD $arg1 $arg2" +& $CMD $arg1 $arg2 + +$ProgressPreference = 'Continue' \ No newline at end of file diff --git a/update-versions.ps1 b/update-versions.ps1 new file mode 100644 index 00000000..793319c6 --- /dev/null +++ b/update-versions.ps1 @@ -0,0 +1,11 @@ +echo "Obtaining version information from .\version" +$v=(Get-Content -Path .\version) +echo " version: $v" +echo "" +$assemblyInfo="./DesktopEdge/Properties/AssemblyInfo.cs" +echo "Replacing version in $assemblyInfo" +(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace '\d\.\d\.\d\.', "$v." | Set-Content -Path $assemblyInfo -Encoding UTF8 + +$installer="./Installer/ZitiDesktopEdge.aip" +echo "Replacing version in $installer" +(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="\d\.\d\.\d"', """ProductVersion"" Value=""${v}""" | Set-Content -Path $installer -Encoding UTF8 From 6bf7c882b58aba8bd5a0e919698591c68c75a80d Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 17:10:00 -0400 Subject: [PATCH 013/202] add current branch asa test --- .github/workflows/installer.build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 00ee96ec..77896cf9 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -4,6 +4,7 @@ on: push: branches: - installer + - *issue-130* env: BUILD_CONFIG: "Release" From b4a2181b6abaa2bc42aa80e89c10714318d9a4be Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 17:20:01 -0400 Subject: [PATCH 014/202] trying to get an action to work --- .github/workflows/installer.build.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 77896cf9..17c5e16c 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -1,4 +1,4 @@ -name: CI +name: Build Installer on: push: @@ -14,10 +14,8 @@ 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 \ No newline at end of file + - uses: actions/checkout@v2 + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1 + - name: Setup NuGet.exe + uses: NuGet/setup-nuget@v1.0.2 \ No newline at end of file From bd25deaa0f388cc232836e25c0282683730dc2c3 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 17:24:22 -0400 Subject: [PATCH 015/202] add apostrophes around wildcards --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 17c5e16c..bc1494d2 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -4,7 +4,7 @@ on: push: branches: - installer - - *issue-130* + - '*issue-130*' env: BUILD_CONFIG: "Release" From 69be55da4bfe558b36050bb07eb01422e87b6192 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 17:41:59 -0400 Subject: [PATCH 016/202] see if powershell will actually kick off and work --- .github/workflows/installer.build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index bc1494d2..114bc2fc 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -18,4 +18,7 @@ jobs: - name: Setup MSBuild uses: microsoft/setup-msbuild@v1 - name: Setup NuGet.exe - uses: NuGet/setup-nuget@v1.0.2 \ No newline at end of file + uses: NuGet/setup-nuget@v1.0.2 + - name: Run a one-line script + run: .\Install\build.ps1 + shell: powershell \ No newline at end of file From 6e567a4d37bdb40e8a3ddedd7d3bd0b1e8e8ce41 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 17:44:02 -0400 Subject: [PATCH 017/202] indent fix --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 114bc2fc..6e92664f 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -21,4 +21,4 @@ jobs: uses: NuGet/setup-nuget@v1.0.2 - name: Run a one-line script run: .\Install\build.ps1 - shell: powershell \ No newline at end of file + shell: powershell \ No newline at end of file From 85dbc6f03e5f26006f0e8ed218c19249593c3d5b Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 17:49:59 -0400 Subject: [PATCH 018/202] update action --- .github/workflows/installer.build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 6e92664f..98d7bb91 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -19,6 +19,6 @@ jobs: uses: microsoft/setup-msbuild@v1 - name: Setup NuGet.exe uses: NuGet/setup-nuget@v1.0.2 - - name: Run a one-line script - run: .\Install\build.ps1 + - name: Build UI and Assemble Installer + run: .\Install\build shell: powershell \ No newline at end of file From 6a2db002c0ede2e65cac67f30175ca044d5fad2a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 18:10:10 -0400 Subject: [PATCH 019/202] installer build action --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 98d7bb91..cf88e458 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,5 +20,5 @@ jobs: - name: Setup NuGet.exe uses: NuGet/setup-nuget@v1.0.2 - name: Build UI and Assemble Installer - run: .\Install\build + run: powershell -File ${{ env.GITHUB_WORKSPACE }}\Install\build shell: powershell \ No newline at end of file From 467026c6d1addc67ab1455699bfbf497d248beeb Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 18:54:13 -0400 Subject: [PATCH 020/202] forgot the .ps1 --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index cf88e458..e1fbfeb3 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,5 +20,5 @@ jobs: - name: Setup NuGet.exe uses: NuGet/setup-nuget@v1.0.2 - name: Build UI and Assemble Installer - run: powershell -File ${{ env.GITHUB_WORKSPACE }}\Install\build + run: powershell -File ${{ env.GITHUB_WORKSPACE }}\Install\build.ps1 shell: powershell \ No newline at end of file From 6a0759b3b116ecace3248891d8cff3201c1ca778 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 18:58:04 -0400 Subject: [PATCH 021/202] go back to relative path --- .github/workflows/installer.build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index e1fbfeb3..65ed4bdc 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,5 +20,6 @@ jobs: - name: Setup NuGet.exe uses: NuGet/setup-nuget@v1.0.2 - name: Build UI and Assemble Installer - run: powershell -File ${{ env.GITHUB_WORKSPACE }}\Install\build.ps1 - shell: powershell \ No newline at end of file + run: powershell -File .\Install\build.ps1 + shell: powershell + \ No newline at end of file From 4b7d10db231abae53a3ae2d59f4c5e6bc6d1b18b Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 19:02:16 -0400 Subject: [PATCH 022/202] Install -> Installer --- .github/workflows/installer.build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 65ed4bdc..86a498fb 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,6 +20,5 @@ jobs: - name: Setup NuGet.exe uses: NuGet/setup-nuget@v1.0.2 - name: Build UI and Assemble Installer - run: powershell -File .\Install\build.ps1 - shell: powershell + run: powershell -File ${env:GITHUB_WORKSPACE}\Installer\build.ps1 \ No newline at end of file From 99ba2b9b75241e63634e453b818e78e5df17c157 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 19:16:35 -0400 Subject: [PATCH 023/202] continually tweaking the powershell command --- Installer/build.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index bf1e9e30..1acc2a41 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -1,5 +1,5 @@ echo "Cleaning previous build folder if it exists" -rm .\build -r -fo +rm .\build -r -fo -ErrorAction Ignore $x=[xml] @" $((Invoke-WebRequest https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/maven-metadata.xml).Content) @@ -30,10 +30,10 @@ echo "Updating the version for UI and Installer" Pop-Location echo "Building the UI" -#msbuild ..\DesktopEdge\ZitiDesktopEdge.csproj /property:Configuration=Release +msbuild ..\DesktopEdge\ZitiDesktopEdge.csproj /property:Configuration=Release echo "Building the Wintun installer" -#msbuild ..\ZitiWintunInstaller.sln /p:configuration=Release +msbuild ..\ZitiWintunInstaller.sln /p:configuration=Release $CMD = "$ENV:ADVINST_EXE" $arg1 = '/build' From 4e207797d8c11ac076f9b756e50a0188f5339e74 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 19:24:22 -0400 Subject: [PATCH 024/202] updating again --- DesktopEdge/Properties/AssemblyInfo.cs | 1 + Installer/ZitiDesktopEdge.aip | 1 + Installer/build.ps1 | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index f7f07fab..ee3e9556 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -55,3 +55,4 @@ using System.Windows; [assembly: AssemblyFileVersion("1.2.10.0")] + diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 845b031c..5a8abc0b 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -302,3 +302,4 @@ + diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 1acc2a41..4b6c2bb8 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -20,13 +20,13 @@ $timeTaken = Measure-Command -Expression { $milliseconds = $timeTaken.TotalMilliseconds echo " time to download: $milliseconds" echo "" -echo "unzipping service" +echo "unzipping ziti-tunnel-service.zip to build\service\" Expand-Archive -Force -LiteralPath ziti-tunnel-service.zip build\service\ Push-Location .. echo "Updating the version for UI and Installer" -.\update-versions.ps1 +&".\update-versions.ps1" Pop-Location echo "Building the UI" From efce40a681be17887f6d69222f8dc22da01fcc24 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 19:36:51 -0400 Subject: [PATCH 025/202] try setting a working directory --- .github/workflows/installer.build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 86a498fb..4e1e03de 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -13,6 +13,8 @@ env: jobs: Build: runs-on: windows-latest + env: + working-direcotry: ${env:GITHUB_WORKSPACE} steps: - uses: actions/checkout@v2 - name: Setup MSBuild @@ -20,5 +22,5 @@ jobs: - name: Setup NuGet.exe uses: NuGet/setup-nuget@v1.0.2 - name: Build UI and Assemble Installer - run: powershell -File ${env:GITHUB_WORKSPACE}\Installer\build.ps1 + run: powershell -File .\Installer\build.ps1 \ No newline at end of file From a3c0295dee1b333af1f554e0d26e22eab0e6a42f Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 19:39:31 -0400 Subject: [PATCH 026/202] github actions and powershell is a joy --- Installer/build.ps1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 4b6c2bb8..ca423223 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -24,9 +24,14 @@ echo "unzipping ziti-tunnel-service.zip to build\service\" Expand-Archive -Force -LiteralPath ziti-tunnel-service.zip build\service\ +echo "---------------------" +pwd +pwd +echo "---------------------" + Push-Location .. echo "Updating the version for UI and Installer" -&".\update-versions.ps1" +.\update-versions.ps1 Pop-Location echo "Building the UI" From 3696411e5b83c98bd44f5ffe66d24cf56382d617 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 19:41:37 -0400 Subject: [PATCH 027/202] one of these days it'll work --- Installer/build.ps1 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index ca423223..c803f7c4 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -1,3 +1,8 @@ +echo "---------------------" +pwd +pwd +echo "---------------------" + echo "Cleaning previous build folder if it exists" rm .\build -r -fo -ErrorAction Ignore @@ -24,10 +29,6 @@ echo "unzipping ziti-tunnel-service.zip to build\service\" Expand-Archive -Force -LiteralPath ziti-tunnel-service.zip build\service\ -echo "---------------------" -pwd -pwd -echo "---------------------" Push-Location .. echo "Updating the version for UI and Installer" From 9d55c6880289566501355d7dca9c2a8062e17a42 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 19:44:02 -0400 Subject: [PATCH 028/202] lets see if this works --- .github/workflows/installer.build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 4e1e03de..1ee0af37 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -23,4 +23,5 @@ jobs: uses: NuGet/setup-nuget@v1.0.2 - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 + working-direcotry: ${env:GITHUB_WORKSPACE} \ No newline at end of file From a7c8e763ca8bd67ffcb31324b1cce1b270a6921e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 19:45:08 -0400 Subject: [PATCH 029/202] keep tryin' --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 1ee0af37..33e26270 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -23,5 +23,5 @@ jobs: uses: NuGet/setup-nuget@v1.0.2 - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 - working-direcotry: ${env:GITHUB_WORKSPACE} + working-direcotry: ${{env.working-direcotry} \ No newline at end of file From b53117c3c60ab7f68c63160b6a286834752f6827 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 19:48:21 -0400 Subject: [PATCH 030/202] another update --- .github/workflows/installer.build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 33e26270..8b00fa29 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -10,11 +10,13 @@ env: BUILD_CONFIG: "Release" BUILDNUMBER: ${{github.run_number}} +defaults: + run: + working-direcotry: ${env:GITHUB_WORKSPACE} + jobs: Build: runs-on: windows-latest - env: - working-direcotry: ${env:GITHUB_WORKSPACE} steps: - uses: actions/checkout@v2 - name: Setup MSBuild @@ -23,5 +25,4 @@ jobs: uses: NuGet/setup-nuget@v1.0.2 - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 - working-direcotry: ${{env.working-direcotry} \ No newline at end of file From ffbf0082c8716b9af6416aee01eaa76f43004039 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 16 Oct 2020 19:50:15 -0400 Subject: [PATCH 031/202] typo fix --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 8b00fa29..1923bd37 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -12,7 +12,7 @@ env: defaults: run: - working-direcotry: ${env:GITHUB_WORKSPACE} + working-directory: ${env:GITHUB_WORKSPACE} jobs: Build: From 7ce3967d52d821faa6e26635be9f48042fb7b9df Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 17:05:22 -0400 Subject: [PATCH 032/202] time to try getting gh actions to work again --- .github/workflows/installer.build.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 1923bd37..0c631962 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -18,7 +18,14 @@ jobs: Build: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - name: Checkout the code + uses: actions/checkout@v2 + - name: Set env + run: echo ::set-env name=workspace::$GITHUB_WORKSPACE + - name: Dump GitHub context + env: + GITHUB_CONTEXT: ${{ toJson(env) }} + run: echo "$GITHUB_CONTEXT" - name: Setup MSBuild uses: microsoft/setup-msbuild@v1 - name: Setup NuGet.exe From 2b1fe295949722d056162a3eebbd8d78b26e2be0 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 17:10:51 -0400 Subject: [PATCH 033/202] try again --- .github/workflows/installer.build.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 0c631962..e5b5d423 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -18,18 +18,5 @@ jobs: Build: runs-on: windows-latest steps: - - name: Checkout the code - uses: actions/checkout@v2 - - name: Set env - run: echo ::set-env name=workspace::$GITHUB_WORKSPACE - - name: Dump GitHub context - env: - GITHUB_CONTEXT: ${{ toJson(env) }} - run: echo "$GITHUB_CONTEXT" - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1 - - name: Setup NuGet.exe - uses: NuGet/setup-nuget@v1.0.2 - - name: Build UI and Assemble Installer - run: powershell -File .\Installer\build.ps1 - \ No newline at end of file + - name: Hello world + run: echo Hello world $GITHUB_WORKSPACE \ No newline at end of file From 5096ade517e40682d2ea8b28c2eb76b2f9193235 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 17:11:49 -0400 Subject: [PATCH 034/202] try again & git push --- .github/workflows/installer.build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index e5b5d423..2453d154 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -10,9 +10,6 @@ env: BUILD_CONFIG: "Release" BUILDNUMBER: ${{github.run_number}} -defaults: - run: - working-directory: ${env:GITHUB_WORKSPACE} jobs: Build: From c6b2bd00cb526dda67b8e1ea5758232737a167b6 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 17:21:39 -0400 Subject: [PATCH 035/202] try again & git push --- .github/workflows/installer.build.yml | 30 +++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 2453d154..5c734aff 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -12,8 +12,30 @@ env: jobs: - Build: - runs-on: windows-latest + one: + runs-on: ubuntu-latest steps: - - name: Hello world - run: echo Hello world $GITHUB_WORKSPACE \ No newline at end of file + - name: Dump GitHub context + env: + GITHUB_CONTEXT: ${{ toJson(github) }} + run: echo "$GITHUB_CONTEXT" + - name: Dump job context + env: + JOB_CONTEXT: ${{ toJson(job) }} + run: echo "$JOB_CONTEXT" + - name: Dump steps context + env: + STEPS_CONTEXT: ${{ toJson(steps) }} + run: echo "$STEPS_CONTEXT" + - name: Dump runner context + env: + RUNNER_CONTEXT: ${{ toJson(runner) }} + run: echo "$RUNNER_CONTEXT" + - name: Dump strategy context + env: + STRATEGY_CONTEXT: ${{ toJson(strategy) }} + run: echo "$STRATEGY_CONTEXT" + - name: Dump matrix context + env: + MATRIX_CONTEXT: ${{ toJson(matrix) }} + run: echo "$MATRIX_CONTEXT" \ No newline at end of file From ea14566736790d00db340cc8fb9e8aa131ff4774 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 17:23:16 -0400 Subject: [PATCH 036/202] now just change the os --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 5c734aff..1b91aa9e 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -13,7 +13,7 @@ env: jobs: one: - runs-on: ubuntu-latest + runs-on: windows-latest steps: - name: Dump GitHub context env: From 364e586b73e54186eb3415569477055f4eb5f177 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 17:33:18 -0400 Subject: [PATCH 037/202] try again --- .github/workflows/installer.build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 1b91aa9e..5a453be1 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -9,6 +9,7 @@ on: env: BUILD_CONFIG: "Release" BUILDNUMBER: ${{github.run_number}} + CURDIR: ${{env.workspace}} jobs: @@ -38,4 +39,8 @@ jobs: - name: Dump matrix context env: MATRIX_CONTEXT: ${{ toJson(matrix) }} - run: echo "$MATRIX_CONTEXT" \ No newline at end of file + run: echo "$MATRIX_CONTEXT" + - name: try using an environment variable 1 + run: echo "This is an environment variable workspace=%workspace%" + - name: try using an environment variable 2 + run: echo "This is an environment variable workspace=%workspace%" \ No newline at end of file From d69c0b6e1f5ce8b879dc13d4b23cd86f6ab30a99 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 17:34:21 -0400 Subject: [PATCH 038/202] try again --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 5a453be1..756eb383 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -9,7 +9,7 @@ on: env: BUILD_CONFIG: "Release" BUILDNUMBER: ${{github.run_number}} - CURDIR: ${{env.workspace}} + CURDIR: ${{github.workspace}} jobs: From c8262ea9a77ddcaf26fa3dc76f2005ff8ad5072a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 17:35:38 -0400 Subject: [PATCH 039/202] try again --- .github/workflows/installer.build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 756eb383..0913aabc 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -41,6 +41,6 @@ jobs: MATRIX_CONTEXT: ${{ toJson(matrix) }} run: echo "$MATRIX_CONTEXT" - name: try using an environment variable 1 - run: echo "This is an environment variable workspace=%workspace%" + run: echo "This is an environment variable workspace=%CURDIR%" - name: try using an environment variable 2 - run: echo "This is an environment variable workspace=%workspace%" \ No newline at end of file + run: echo "This is an environment variable workspace=$CURDIR \ No newline at end of file From 8a8f707f2de3dcc9f3ce00231884f741538e4ad4 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 17:36:42 -0400 Subject: [PATCH 040/202] try again --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 0913aabc..2d4007f5 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -43,4 +43,4 @@ jobs: - name: try using an environment variable 1 run: echo "This is an environment variable workspace=%CURDIR%" - name: try using an environment variable 2 - run: echo "This is an environment variable workspace=$CURDIR \ No newline at end of file + run: echo "This is an environment variable workspace=$CURDIR" \ No newline at end of file From e3b0a330f80c8d51f35072115f1c76b3178069cd Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 17:42:28 -0400 Subject: [PATCH 041/202] try again --- .github/workflows/installer.build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 2d4007f5..5d8d5d52 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -40,7 +40,10 @@ jobs: env: MATRIX_CONTEXT: ${{ toJson(matrix) }} run: echo "$MATRIX_CONTEXT" + + - name: Set env + run: echo ::set-env name=workspace::$GITHUB_WORKSPACE - name: try using an environment variable 1 - run: echo "This is an environment variable workspace=%CURDIR%" + run: echo "This is an environment variable workspace=%workspace%" - name: try using an environment variable 2 - run: echo "This is an environment variable workspace=$CURDIR" \ No newline at end of file + run: echo "This is an environment variable workspace=workspace" From 43b384d042090a201e95103b2edeba234a14d799 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 17:43:42 -0400 Subject: [PATCH 042/202] try again --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 5d8d5d52..cdd688d4 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -42,7 +42,7 @@ jobs: run: echo "$MATRIX_CONTEXT" - name: Set env - run: echo ::set-env name=workspace::$GITHUB_WORKSPACE + run: echo ::set-env name=workspace::$CURDIR - name: try using an environment variable 1 run: echo "This is an environment variable workspace=%workspace%" - name: try using an environment variable 2 From d43fd2e9d31b69cb5481531a0885717b643b281b Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 18:20:43 -0400 Subject: [PATCH 043/202] try again --- .github/workflows/installer.build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index cdd688d4..bfcf6938 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -15,6 +15,9 @@ env: jobs: one: runs-on: windows-latest + env: + FIRST_NAME: Mona + CURDIR: ${{ github.workspace }} steps: - name: Dump GitHub context env: @@ -42,8 +45,4 @@ jobs: run: echo "$MATRIX_CONTEXT" - name: Set env - run: echo ::set-env name=workspace::$CURDIR - - name: try using an environment variable 1 - run: echo "This is an environment variable workspace=%workspace%" - - name: try using an environment variable 2 - run: echo "This is an environment variable workspace=workspace" + run: echo "CURDIR: $CURDIR" From 0e7cf02fb99428e37479465431116e076447c2be Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 18:22:22 -0400 Subject: [PATCH 044/202] try again --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index bfcf6938..0f794416 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -45,4 +45,4 @@ jobs: run: echo "$MATRIX_CONTEXT" - name: Set env - run: echo "CURDIR: $CURDIR" + run: echo "CURDIR ; $CURDIR" From f7a46f76278fb2e6a4d168a7fff6663e8ae12ada Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 18:23:49 -0400 Subject: [PATCH 045/202] try again --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 0f794416..81a3aba9 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -45,4 +45,4 @@ jobs: run: echo "$MATRIX_CONTEXT" - name: Set env - run: echo "CURDIR ; $CURDIR" + run: echo "CURDIR ; %CURDIR%" From 2cd14c6c4b3e7db7d62aa76b4ad524587e24fbf1 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 18:30:21 -0400 Subject: [PATCH 046/202] try again --- .github/workflows/installer.build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 81a3aba9..a34e6258 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -45,4 +45,6 @@ jobs: run: echo "$MATRIX_CONTEXT" - name: Set env - run: echo "CURDIR ; %CURDIR%" + env: + CURDIR: ${{ $CURDIR }} + run: echo "CURDIR ---- %CURDIR%" && echo "this is annoying ---- $CURDIR" From 8de5f3729cfad1bc3937ccd9ff2ed35dbaaf885d Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 18:31:45 -0400 Subject: [PATCH 047/202] try again --- .github/workflows/installer.build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index a34e6258..3bb0eec1 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -46,5 +46,5 @@ jobs: - name: Set env env: - CURDIR: ${{ $CURDIR }} - run: echo "CURDIR ---- %CURDIR%" && echo "this is annoying ---- $CURDIR" + $CURDIR2: ${{ github.workspace }} + run: echo "CURDIR ---- %CURDIR%" && echo "this is annoying ---- $CURDIR2" From ea839bc4de4ee8eca36bce67cf20eafa82fc2823 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 18:35:14 -0400 Subject: [PATCH 048/202] now just change the os --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 3bb0eec1..c80db06c 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -47,4 +47,4 @@ jobs: - name: Set env env: $CURDIR2: ${{ github.workspace }} - run: echo "CURDIR ---- %CURDIR%" && echo "this is annoying ---- $CURDIR2" + run: set From 26c9089eede482caeaa292337ffdaed17fdb00a5 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 19:35:04 -0400 Subject: [PATCH 049/202] now just change the os --- .github/workflows/installer.build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index c80db06c..39bac28d 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -44,7 +44,10 @@ jobs: MATRIX_CONTEXT: ${{ toJson(matrix) }} run: echo "$MATRIX_CONTEXT" - - name: Set env + - name: echo env env: $CURDIR2: ${{ github.workspace }} - run: set + run: cmd -k set + + - name: try an echo + run: cmd -k echo "hi %CURDIR% - %CURDIR2%" From 0b5234818fc344d837d5bbff82c9ab9540b569d1 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 19:43:33 -0400 Subject: [PATCH 050/202] now just change the os --- .github/workflows/installer.build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 39bac28d..82bf5bc8 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -50,4 +50,6 @@ jobs: run: cmd -k set - name: try an echo - run: cmd -k echo "hi %CURDIR% - %CURDIR2%" + run: | + echo "a hi %CURDIR% - b %CURDIR2%" + shell: powershell From 4937c90c25b5c052568eef01a273d8b9d194b2cc Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 19:45:06 -0400 Subject: [PATCH 051/202] now just change the os --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 82bf5bc8..65bf27b2 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -46,7 +46,7 @@ jobs: - name: echo env env: - $CURDIR2: ${{ github.workspace }} + CURDIR2: ${{ github.workspace }} run: cmd -k set - name: try an echo From 0d46dde86a5e5658810019dfce5f91345768490b Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 19:51:16 -0400 Subject: [PATCH 052/202] try again --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 65bf27b2..cd662b5f 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -51,5 +51,5 @@ jobs: - name: try an echo run: | - echo "a hi %CURDIR% - b %CURDIR2%" + echo "a hi $CURDIR - b $CURDIR2 - c {{ $CURDIR }} - d {{ $CURDIR2 }} - e {{ CURDIR }} - f {{ CURDIR2 }} " shell: powershell From 8218dee1ef109dcce4ab1a30e70e1a2e5941f13e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 20:03:37 -0400 Subject: [PATCH 053/202] still trying to get powershell to execute properly in a github action --- Installer/build.ps1 | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index c803f7c4..a950eb89 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -1,11 +1,20 @@ -echo "---------------------" -pwd -pwd -echo "---------------------" - echo "Cleaning previous build folder if it exists" rm .\build -r -fo -ErrorAction Ignore +echo "-----------------------------------------" +echo "-----------------------------------------" +echo "-----------------------------------------" +echo "-----------------------------------------" + +$invocation = (Get-Variable MyInvocation).Value +$scriptPath = Split-Path $invocation.MyCommand.Path +$scriptPath + +echo "-----------------------------------------" +echo "-----------------------------------------" +echo "-----------------------------------------" +echo "-----------------------------------------" + $x=[xml] @" $((Invoke-WebRequest https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/maven-metadata.xml).Content) "@ From e4e925c291952d84719bd89183f34adf20ecca9a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 20:05:40 -0400 Subject: [PATCH 054/202] try 431 --- .github/workflows/installer.build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index cd662b5f..ae6228bc 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -53,3 +53,9 @@ jobs: run: | echo "a hi $CURDIR - b $CURDIR2 - c {{ $CURDIR }} - d {{ $CURDIR2 }} - e {{ CURDIR }} - f {{ CURDIR2 }} " shell: powershell + + - name: Checkout the code + uses: actions/checkout@v2 + + - name: Build UI and Assemble Installer + run: powershell -File .\Installer\build.ps1 From 2b4dd7b100e52e0e82c238c8980b8abfaffd9c27 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 20:07:53 -0400 Subject: [PATCH 055/202] try 431 --- Installer/build.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index a950eb89..ac256ca6 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -8,7 +8,7 @@ echo "-----------------------------------------" $invocation = (Get-Variable MyInvocation).Value $scriptPath = Split-Path $invocation.MyCommand.Path -$scriptPath +${scriptPath} echo "-----------------------------------------" echo "-----------------------------------------" @@ -39,7 +39,7 @@ echo "unzipping ziti-tunnel-service.zip to build\service\" Expand-Archive -Force -LiteralPath ziti-tunnel-service.zip build\service\ -Push-Location .. +Push-Location ${scriptPath}\.. echo "Updating the version for UI and Installer" .\update-versions.ps1 Pop-Location From b694a27d807b8e1d69f49b112cdfc0b1aaeaf82b Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 20:10:49 -0400 Subject: [PATCH 056/202] try 432 --- .github/workflows/installer.build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index ae6228bc..4be5788c 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -57,5 +57,9 @@ jobs: - name: Checkout the code uses: actions/checkout@v2 + - name: Setup NuGet.exe + uses: NuGet/setup-nuget@v1.0.2 + - name: Build UI and Assemble Installer + uses: microsoft/setup-msbuild@v1 run: powershell -File .\Installer\build.ps1 From 1da72c261d4988a08c01d62ab1080bba6cae5ab9 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 20:11:19 -0400 Subject: [PATCH 057/202] try 433 --- .github/workflows/installer.build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 4be5788c..f951facb 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -57,9 +57,11 @@ jobs: - name: Checkout the code 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 UI and Assemble Installer - uses: microsoft/setup-msbuild@v1 run: powershell -File .\Installer\build.ps1 From 51d6f80c924c428715eedfc911bd09fd3f89648a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 20:12:59 -0400 Subject: [PATCH 058/202] try 434 --- Installer/build.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index ac256ca6..16be2e5c 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -42,13 +42,14 @@ Expand-Archive -Force -LiteralPath ziti-tunnel-service.zip build\service\ Push-Location ${scriptPath}\.. echo "Updating the version for UI and Installer" .\update-versions.ps1 -Pop-Location echo "Building the UI" -msbuild ..\DesktopEdge\ZitiDesktopEdge.csproj /property:Configuration=Release +msbuild DesktopEdge\ZitiDesktopEdge.csproj /property:Configuration=Release echo "Building the Wintun installer" -msbuild ..\ZitiWintunInstaller.sln /p:configuration=Release +msbuild ZitiWintunInstaller.sln /p:configuration=Release + +Pop-Location $CMD = "$ENV:ADVINST_EXE" $arg1 = '/build' From f2a48579361284a73b0b68c93b0a8a987a433463 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 20:25:09 -0400 Subject: [PATCH 059/202] try 435 --- .github/workflows/installer.build.yml | 4 ++-- Installer/build.ps1 | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index f951facb..4e4d56b4 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -59,9 +59,9 @@ jobs: - name: Setup MSBuild uses: microsoft/setup-msbuild@v1 - + - name: Setup NuGet.exe uses: NuGet/setup-nuget@v1.0.2 - + - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 16be2e5c..ef089637 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -43,6 +43,9 @@ Push-Location ${scriptPath}\.. echo "Updating the version for UI and Installer" .\update-versions.ps1 +echo "Running nuget install" +nuget install + echo "Building the UI" msbuild DesktopEdge\ZitiDesktopEdge.csproj /property:Configuration=Release From b0374092849ae32f8f898d6237a04ab3c613670e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 20:35:43 -0400 Subject: [PATCH 060/202] try 436 --- .github/workflows/installer.build.yml | 49 +++------------------------ 1 file changed, 4 insertions(+), 45 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 4e4d56b4..f4d650b1 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -11,7 +11,6 @@ env: BUILDNUMBER: ${{github.run_number}} CURDIR: ${{github.workspace}} - jobs: one: runs-on: windows-latest @@ -19,49 +18,9 @@ jobs: FIRST_NAME: Mona CURDIR: ${{ github.workspace }} steps: - - name: Dump GitHub context - env: - GITHUB_CONTEXT: ${{ toJson(github) }} - run: echo "$GITHUB_CONTEXT" - - name: Dump job context - env: - JOB_CONTEXT: ${{ toJson(job) }} - run: echo "$JOB_CONTEXT" - - name: Dump steps context - env: - STEPS_CONTEXT: ${{ toJson(steps) }} - run: echo "$STEPS_CONTEXT" - - name: Dump runner context - env: - RUNNER_CONTEXT: ${{ toJson(runner) }} - run: echo "$RUNNER_CONTEXT" - - name: Dump strategy context - env: - STRATEGY_CONTEXT: ${{ toJson(strategy) }} - run: echo "$STRATEGY_CONTEXT" - - name: Dump matrix context - env: - MATRIX_CONTEXT: ${{ toJson(matrix) }} - run: echo "$MATRIX_CONTEXT" - - - name: echo env - env: - CURDIR2: ${{ github.workspace }} - run: cmd -k set - - - name: try an echo - run: | - echo "a hi $CURDIR - b $CURDIR2 - c {{ $CURDIR }} - d {{ $CURDIR2 }} - e {{ CURDIR }} - f {{ CURDIR2 }} " - shell: powershell - - - name: Checkout the code - uses: actions/checkout@v2 - - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1 - - - name: Setup NuGet.exe - uses: NuGet/setup-nuget@v1.0.2 - + - uses: actions/checkout@master + - uses: NuGet/setup-nuget@v1.0.2 + - name: Restore nuget packages + run: nuget restore ZitiDesktopEdge.sln - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 From 90e36482f4a13600fdf337f061a8619f16497b66 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 20:37:40 -0400 Subject: [PATCH 061/202] try 438 --- .github/workflows/installer.build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index f4d650b1..7598237e 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,6 +20,7 @@ jobs: steps: - uses: actions/checkout@master - uses: NuGet/setup-nuget@v1.0.2 + - uses: microsoft/setup-msbuild@v1 - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln - name: Build UI and Assemble Installer From 64b63a150903614017ee4adb97ff0dde4a33f86f Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 20:42:57 -0400 Subject: [PATCH 062/202] try 436 --- .github/workflows/installer.build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 7598237e..012170d1 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -21,6 +21,8 @@ jobs: - uses: actions/checkout@master - uses: NuGet/setup-nuget@v1.0.2 - uses: microsoft/setup-msbuild@v1 + - name: Install advanced installer + run: choco --yes install advanced-installer - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln - name: Build UI and Assemble Installer From 148d4ecb611c75e9978631311ad08c3b1862b9c6 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 21:01:09 -0400 Subject: [PATCH 063/202] try 436 --- .github/workflows/installer.build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 012170d1..d4d8120b 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -21,8 +21,10 @@ jobs: - uses: actions/checkout@master - uses: NuGet/setup-nuget@v1.0.2 - uses: microsoft/setup-msbuild@v1 + - name: Trying to run choco install + run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - name: Install advanced installer - run: choco --yes install advanced-installer + run: choco install advanced-installer --yes - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln - name: Build UI and Assemble Installer From 23cb7b1ba0c5a1f2cd4b8ed57861f2d9e733b3fa Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 21:10:15 -0400 Subject: [PATCH 064/202] try 436 --- .github/workflows/installer.build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index d4d8120b..7023fb02 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -15,7 +15,6 @@ jobs: one: runs-on: windows-latest env: - FIRST_NAME: Mona CURDIR: ${{ github.workspace }} steps: - uses: actions/checkout@master From 5dd2a54c964b5b7f380245f6e4ec768bf430b388 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 21:10:52 -0400 Subject: [PATCH 065/202] try 436 --- Installer/build.ps1 | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index ef089637..99369ff2 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -1,20 +1,10 @@ echo "Cleaning previous build folder if it exists" rm .\build -r -fo -ErrorAction Ignore -echo "-----------------------------------------" -echo "-----------------------------------------" -echo "-----------------------------------------" -echo "-----------------------------------------" - $invocation = (Get-Variable MyInvocation).Value $scriptPath = Split-Path $invocation.MyCommand.Path ${scriptPath} -echo "-----------------------------------------" -echo "-----------------------------------------" -echo "-----------------------------------------" -echo "-----------------------------------------" - $x=[xml] @" $((Invoke-WebRequest https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/maven-metadata.xml).Content) "@ @@ -38,14 +28,10 @@ echo "unzipping ziti-tunnel-service.zip to build\service\" Expand-Archive -Force -LiteralPath ziti-tunnel-service.zip build\service\ - Push-Location ${scriptPath}\.. echo "Updating the version for UI and Installer" .\update-versions.ps1 -echo "Running nuget install" -nuget install - echo "Building the UI" msbuild DesktopEdge\ZitiDesktopEdge.csproj /property:Configuration=Release @@ -55,6 +41,7 @@ msbuild ZitiWintunInstaller.sln /p:configuration=Release Pop-Location $CMD = "$ENV:ADVINST_EXE" +$CMD = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86> pwd .\AdvancedInstaller.com" $arg1 = '/build' $arg2 = '.\ZitiDesktopEdge.aip' From dc6bee3557455c43ee9eab148ef65a0812346197 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 21:14:28 -0400 Subject: [PATCH 066/202] try 436 --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 7023fb02..4caf5e13 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@master - uses: NuGet/setup-nuget@v1.0.2 - uses: microsoft/setup-msbuild@v1 - - name: Trying to run choco install + - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - name: Install advanced installer run: choco install advanced-installer --yes From 15d87dcd47cd924c145c6f13d29f1156978e62a7 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 21:18:33 -0400 Subject: [PATCH 067/202] try 436 --- Installer/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 99369ff2..a525fd75 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -41,7 +41,7 @@ msbuild ZitiWintunInstaller.sln /p:configuration=Release Pop-Location $CMD = "$ENV:ADVINST_EXE" -$CMD = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86> pwd .\AdvancedInstaller.com" +$CMD = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" $arg1 = '/build' $arg2 = '.\ZitiDesktopEdge.aip' From 7f378760530903e4a47d78fd4554cbd28e758bd1 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 21:33:57 -0400 Subject: [PATCH 068/202] try 436 --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 4caf5e13..d70da194 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -23,7 +23,7 @@ jobs: - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - name: Install advanced installer - run: choco install advanced-installer --yes + run: choco install advanced-installer wixtoolset --yes - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln - name: Build UI and Assemble Installer From ca364027f626258abda557404d7161d0a554cde7 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 21:50:58 -0400 Subject: [PATCH 069/202] try 436 --- Installer/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index a525fd75..5c027c0f 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -43,7 +43,7 @@ Pop-Location $CMD = "$ENV:ADVINST_EXE" $CMD = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" $arg1 = '/build' -$arg2 = '.\ZitiDesktopEdge.aip' +$arg2 = "${scriptPath}\ZitiDesktopEdge.aip" echo "Assembling installer using AdvancedInstaller at: $CMD $arg1 $arg2" & $CMD $arg1 $arg2 From 6da18585607a2832119d6e4a1c9327e020550ae7 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 22:45:20 -0400 Subject: [PATCH 070/202] wheee --- Installer/build.ps1 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 5c027c0f..0ce633a6 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -26,20 +26,24 @@ echo " time to download: $milliseconds" echo "" echo "unzipping ziti-tunnel-service.zip to build\service\" -Expand-Archive -Force -LiteralPath ziti-tunnel-service.zip build\service\ +Expand-Archive -Verbose -Force -LiteralPath ziti-tunnel-service.zip build\service\ Push-Location ${scriptPath}\.. echo "Updating the version for UI and Installer" .\update-versions.ps1 echo "Building the UI" -msbuild DesktopEdge\ZitiDesktopEdge.csproj /property:Configuration=Release +#msbuild DesktopEdge\ZitiDesktopEdge.csproj /property:Configuration=Release +msbuild ZitiDesktopEdge.sln /property:Configuration=Release + echo "Building the Wintun installer" msbuild ZitiWintunInstaller.sln /p:configuration=Release Pop-Location +tree + $CMD = "$ENV:ADVINST_EXE" $CMD = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" $arg1 = '/build' From 092252be6a0fda4a0933658145c47a3aa01c9ac3 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 22:57:41 -0400 Subject: [PATCH 071/202] use full paths everywhere --- Installer/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 0ce633a6..6ffecb65 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -26,7 +26,7 @@ echo " time to download: $milliseconds" echo "" echo "unzipping ziti-tunnel-service.zip to build\service\" -Expand-Archive -Verbose -Force -LiteralPath ziti-tunnel-service.zip build\service\ +Expand-Archive -Verbose -Force -LiteralPath ziti-tunnel-service.zip "${scriptPath}build\service\" Push-Location ${scriptPath}\.. echo "Updating the version for UI and Installer" From e798b33d0b2ebafad886838f322f9d95e93cdb66 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 23:03:58 -0400 Subject: [PATCH 072/202] gah - missed the backslash --- Installer/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 6ffecb65..0b57281f 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -26,7 +26,7 @@ echo " time to download: $milliseconds" echo "" echo "unzipping ziti-tunnel-service.zip to build\service\" -Expand-Archive -Verbose -Force -LiteralPath ziti-tunnel-service.zip "${scriptPath}build\service\" +Expand-Archive -Verbose -Force -LiteralPath ziti-tunnel-service.zip "${scriptPath}\build\service\" Push-Location ${scriptPath}\.. echo "Updating the version for UI and Installer" From b5ad12195afc671298687193803c4ebdbc91a6ca Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sat, 17 Oct 2020 23:26:29 -0400 Subject: [PATCH 073/202] almost? --- .github/workflows/installer.build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index d70da194..2b940bb6 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -26,5 +26,11 @@ jobs: run: choco install advanced-installer wixtoolset --yes - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln + - name: Write key file + env: + AUTH: ${{ secrets.AUTH }} + run: | + echo "$AUTH" | base64 --decode > ${HOME}/../WinSign.p12 + - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 From 2035133a4024aba0859aac1de53b2cdd9eca99fd Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 18:49:31 -0400 Subject: [PATCH 074/202] try, try again --- .github/workflows/installer.build.yml | 35 +++++++++++++++------------ 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 2b940bb6..800d348d 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -17,20 +17,23 @@ jobs: env: CURDIR: ${{ github.workspace }} steps: - - uses: actions/checkout@master - - uses: NuGet/setup-nuget@v1.0.2 - - uses: microsoft/setup-msbuild@v1 - - name: Trying to run choco install. - run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - - name: Install advanced installer - run: choco install advanced-installer wixtoolset --yes - - name: Restore nuget packages - run: nuget restore ZitiDesktopEdge.sln - - name: Write key file + - run: echo "%CURDIR% - $CURDIR" env: - AUTH: ${{ secrets.AUTH }} - run: | - echo "$AUTH" | base64 --decode > ${HOME}/../WinSign.p12 - - - name: Build UI and Assemble Installer - run: powershell -File .\Installer\build.ps1 + CURDIR: ${{github.workspace}} +# - uses: actions/checkout@master +# - uses: NuGet/setup-nuget@v1.0.2 +# - uses: microsoft/setup-msbuild@v1 +# - name: Trying to run choco install. +# run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) +# - name: Install advanced installer +# run: choco install advanced-installer wixtoolset --yes +# - name: Restore nuget packages +# run: nuget restore ZitiDesktopEdge.sln +# - name: Write key file +# env: +# AUTH: ${{ secrets.AUTH }} +# run: | +# echo "$AUTH" | base64 --decode > ${HOME}/../WinSign.p12 +# +# - name: Build UI and Assemble Installer +# run: powershell -File .\Installer\build.ps1 From 4f675bf5b63f25e47007431906cb0b8fa90be5f1 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 18:53:32 -0400 Subject: [PATCH 075/202] try, try again --- .github/workflows/installer.build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 800d348d..42d18420 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -17,9 +17,10 @@ jobs: env: CURDIR: ${{ github.workspace }} steps: - - run: echo "%CURDIR% - $CURDIR" + - run: echo "%CURDIR% - $CURDIR %SOME_KEY% - $SOME_KEY" env: CURDIR: ${{github.workspace}} + SOME_KEY: ${{secrets.SOME_KEY}} # - uses: actions/checkout@master # - uses: NuGet/setup-nuget@v1.0.2 # - uses: microsoft/setup-msbuild@v1 From 381d31670f0f4fd469912f6e1a95acba20ee8891 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 18:54:38 -0400 Subject: [PATCH 076/202] try, try again --- .github/workflows/installer.build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 42d18420..24cf7d29 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -19,8 +19,8 @@ jobs: steps: - run: echo "%CURDIR% - $CURDIR %SOME_KEY% - $SOME_KEY" env: - CURDIR: ${{github.workspace}} - SOME_KEY: ${{secrets.SOME_KEY}} + CURDIR: ${{ github.workspace }} + SOME_KEY: ${{ secrets.SOME_KEY }} # - uses: actions/checkout@master # - uses: NuGet/setup-nuget@v1.0.2 # - uses: microsoft/setup-msbuild@v1 From 76664d80c3a791109f99731704fe8c423d4377e5 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 18:58:16 -0400 Subject: [PATCH 077/202] try, try again --- .github/workflows/installer.build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 24cf7d29..3816f01b 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -13,9 +13,15 @@ env: jobs: one: + name: New Name runs-on: windows-latest env: CURDIR: ${{ github.workspace }} + CODE: ${{ github.workspace }}/go/src/github.com/${{ github.repository }} + + - name: Print Code + run: echo ${CODE} + steps: - run: echo "%CURDIR% - $CURDIR %SOME_KEY% - $SOME_KEY" env: From ced65c01b7417c7503bd4c5fb7e64dfdee6654cb Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 18:58:45 -0400 Subject: [PATCH 078/202] try, try again --- .github/workflows/installer.build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 3816f01b..db63ee0a 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -19,10 +19,10 @@ jobs: CURDIR: ${{ github.workspace }} CODE: ${{ github.workspace }}/go/src/github.com/${{ github.repository }} - - name: Print Code - run: echo ${CODE} - steps: + - name: Print Code + run: echo ${CODE} + - run: echo "%CURDIR% - $CURDIR %SOME_KEY% - $SOME_KEY" env: CURDIR: ${{ github.workspace }} From dfef33662ddb3f7a7fb0882615c15bf828b7f681 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 19:00:30 -0400 Subject: [PATCH 079/202] try, try again --- .github/workflows/installer.build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index db63ee0a..613bff57 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,9 +20,11 @@ jobs: CODE: ${{ github.workspace }}/go/src/github.com/${{ github.repository }} steps: - - name: Print Code - run: echo ${CODE} - + - name: Print new build number + run: | + echo "Build number is ${{ steps.buildnumber.outputs.build_number }}" + echo "Build number is ${env:BUILD_NUMBER}" + - run: echo "%CURDIR% - $CURDIR %SOME_KEY% - $SOME_KEY" env: CURDIR: ${{ github.workspace }} From 3906e9c937865caf30646ae3948a7fdf36bf5040 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 19:01:31 -0400 Subject: [PATCH 080/202] try, try again --- .github/workflows/installer.build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 613bff57..8320e65a 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -21,9 +21,9 @@ jobs: steps: - name: Print new build number - run: | - echo "Build number is ${{ steps.buildnumber.outputs.build_number }}" - echo "Build number is ${env:BUILD_NUMBER}" + run: | + echo "Build number is ${{ steps.buildnumber.outputs.build_number }}" + echo "Build number is ${env:BUILD_NUMBER}" - run: echo "%CURDIR% - $CURDIR %SOME_KEY% - $SOME_KEY" env: From f5598ed522801708a8df51f1eda598707d491a4c Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 19:03:10 -0400 Subject: [PATCH 081/202] try, try again --- .github/workflows/installer.build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 8320e65a..5e238e5c 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -24,7 +24,9 @@ jobs: run: | echo "Build number is ${{ steps.buildnumber.outputs.build_number }}" echo "Build number is ${env:BUILD_NUMBER}" - + env: + BUILD_NUMBER: "Please Work" + - run: echo "%CURDIR% - $CURDIR %SOME_KEY% - $SOME_KEY" env: CURDIR: ${{ github.workspace }} From 103e756ee22fa107e94beb6365f540e872980a34 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 19:04:34 -0400 Subject: [PATCH 082/202] try, try again --- .github/workflows/installer.build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 5e238e5c..d62dbdde 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -26,8 +26,8 @@ jobs: echo "Build number is ${env:BUILD_NUMBER}" env: BUILD_NUMBER: "Please Work" - - - run: echo "%CURDIR% - $CURDIR %SOME_KEY% - $SOME_KEY" + + - run: echo "${env:$CURDIR} - ${env:SOME_KEY}" env: CURDIR: ${{ github.workspace }} SOME_KEY: ${{ secrets.SOME_KEY }} From 0b77c38fc442b3ffb8be7900c0b93aead44776ee Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 19:07:22 -0400 Subject: [PATCH 083/202] try, try again --- .github/workflows/installer.build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index d62dbdde..9e660b3b 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -27,7 +27,10 @@ jobs: env: BUILD_NUMBER: "Please Work" - - run: echo "${env:$CURDIR} - ${env:SOME_KEY}" + - run: | + echo "${env:$CURDIR} - ${env:SOME_KEY}" + echo "${env:SOME_KEY}" > some_file.txt + type some_file.txt env: CURDIR: ${{ github.workspace }} SOME_KEY: ${{ secrets.SOME_KEY }} From b050f54c7031fa72d9270ca4dc40c41695419dbe Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 19:08:20 -0400 Subject: [PATCH 084/202] try, try again --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 9e660b3b..3e831281 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -28,7 +28,7 @@ jobs: BUILD_NUMBER: "Please Work" - run: | - echo "${env:$CURDIR} - ${env:SOME_KEY}" + echo "${env:CODE} - ${env:SOME_KEY}" echo "${env:SOME_KEY}" > some_file.txt type some_file.txt env: From e3aa94c077f0d524a5f0e8760b189e097c8d22e3 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 19:09:24 -0400 Subject: [PATCH 085/202] try, try again --- .github/workflows/installer.build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 3e831281..fa886941 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -18,7 +18,7 @@ jobs: env: CURDIR: ${{ github.workspace }} CODE: ${{ github.workspace }}/go/src/github.com/${{ github.repository }} - + SOME_KEY: ${{ secrets.SOME_KEY }} steps: - name: Print new build number run: | @@ -33,7 +33,6 @@ jobs: type some_file.txt env: CURDIR: ${{ github.workspace }} - SOME_KEY: ${{ secrets.SOME_KEY }} # - uses: actions/checkout@master # - uses: NuGet/setup-nuget@v1.0.2 # - uses: microsoft/setup-msbuild@v1 From 01bbae8792c45314e0db328ffadaa3ea04c68de6 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 19:13:06 -0400 Subject: [PATCH 086/202] try, try again --- .github/workflows/installer.build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index fa886941..995cc61c 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,6 +20,11 @@ jobs: CODE: ${{ github.workspace }}/go/src/github.com/${{ github.repository }} SOME_KEY: ${{ secrets.SOME_KEY }} steps: + - shell: pwsh + env: + SUPER_SECRET: ${{ secrets.SOME_KEY }} + run: | + echo "$env:SUPER_SECRET" - name: Print new build number run: | echo "Build number is ${{ steps.buildnumber.outputs.build_number }}" From 558e8b932fb0776e8faf0e3623c4938d5342fe86 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 21:05:07 -0400 Subject: [PATCH 087/202] try, try again --- .github/workflows/installer.build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 995cc61c..a7423f63 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -24,7 +24,7 @@ jobs: env: SUPER_SECRET: ${{ secrets.SOME_KEY }} run: | - echo "$env:SUPER_SECRET" + echo "$env:SUPER_SECRET" - name: Print new build number run: | echo "Build number is ${{ steps.buildnumber.outputs.build_number }}" @@ -34,8 +34,7 @@ jobs: - run: | echo "${env:CODE} - ${env:SOME_KEY}" - echo "${env:SOME_KEY}" > some_file.txt - type some_file.txt + echo "${env:SOME_KEY}" | wsl head -c 3 env: CURDIR: ${{ github.workspace }} # - uses: actions/checkout@master From d3b42bdf541a3802b547f93bc5d43e6f5a2c45fd Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 21:10:37 -0400 Subject: [PATCH 088/202] try, try again --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index a7423f63..1da8e10f 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -34,7 +34,7 @@ jobs: - run: | echo "${env:CODE} - ${env:SOME_KEY}" - echo "${env:SOME_KEY}" | wsl head -c 3 + echo "${env:SOME_KEY}" | head -c 3 env: CURDIR: ${{ github.workspace }} # - uses: actions/checkout@master From 0f77678ffd87c88587fbb224d7154acaebd2b42e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 21:46:14 -0400 Subject: [PATCH 089/202] try, try again --- .github/workflows/installer.build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 1da8e10f..26d475f9 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -34,7 +34,10 @@ jobs: - run: | echo "${env:CODE} - ${env:SOME_KEY}" - echo "${env:SOME_KEY}" | head -c 3 + echo "${env:SOME_KEY}" > some_key.b64 + C:\Windows\System32\certutil.exe -decode some_key.b64 bob.out + cat bob.out + env: CURDIR: ${{ github.workspace }} # - uses: actions/checkout@master From 22309600a80ad08e862ced476f40b56025972e90 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 21:48:20 -0400 Subject: [PATCH 090/202] try, try again --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 26d475f9..2b531ad7 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -36,7 +36,7 @@ jobs: echo "${env:CODE} - ${env:SOME_KEY}" echo "${env:SOME_KEY}" > some_key.b64 C:\Windows\System32\certutil.exe -decode some_key.b64 bob.out - cat bob.out + pwd env: CURDIR: ${{ github.workspace }} From d698ae9cfc76e69f1aae4b218a9308f7fcff5111 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 21:54:51 -0400 Subject: [PATCH 091/202] update aip and build --- .github/workflows/installer.build.yml | 4 +--- Installer/ZitiDesktopEdge.aip | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 2b531ad7..80d064cf 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -34,9 +34,7 @@ jobs: - run: | echo "${env:CODE} - ${env:SOME_KEY}" - echo "${env:SOME_KEY}" > some_key.b64 - C:\Windows\System32\certutil.exe -decode some_key.b64 bob.out - pwd + echo "${env:SOME_KEY}" > WinSign.p12 env: CURDIR: ${{ github.workspace }} diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 5a8abc0b..b975027f 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -100,7 +100,7 @@ - + From d06fb592e322ee22828e95b536b109189bdc0935 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 21:58:46 -0400 Subject: [PATCH 092/202] still trying --- .github/workflows/installer.build.yml | 60 +++++++++++++-------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 80d064cf..84ddac7c 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,38 +20,34 @@ jobs: CODE: ${{ github.workspace }}/go/src/github.com/${{ github.repository }} SOME_KEY: ${{ secrets.SOME_KEY }} steps: - - shell: pwsh - env: - SUPER_SECRET: ${{ secrets.SOME_KEY }} - run: | - echo "$env:SUPER_SECRET" - - name: Print new build number - run: | - echo "Build number is ${{ steps.buildnumber.outputs.build_number }}" - echo "Build number is ${env:BUILD_NUMBER}" - env: - BUILD_NUMBER: "Please Work" - +# - shell: pwsh +# env: +# SUPER_SECRET: ${{ secrets.SOME_KEY }} +# run: | +# echo "$env:SUPER_SECRET" +# - name: Print new build number +# run: | +# echo "Build number is ${{ steps.buildnumber.outputs.build_number }}" +# echo "Build number is ${env:BUILD_NUMBER}" +# env: +# BUILD_NUMBER: "Please Work" +# - run: | echo "${env:CODE} - ${env:SOME_KEY}" - echo "${env:SOME_KEY}" > WinSign.p12 + echo "${env:SOME_KEY}" > WinSign.b64 + C:\Windows\System32\certutil.exe -decode WinSign.b64 WinSign.p12 + pwd + dir - env: - CURDIR: ${{ github.workspace }} -# - uses: actions/checkout@master -# - uses: NuGet/setup-nuget@v1.0.2 -# - uses: microsoft/setup-msbuild@v1 -# - name: Trying to run choco install. -# run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) -# - name: Install advanced installer -# run: choco install advanced-installer wixtoolset --yes -# - name: Restore nuget packages -# run: nuget restore ZitiDesktopEdge.sln -# - name: Write key file -# env: -# AUTH: ${{ secrets.AUTH }} -# run: | -# echo "$AUTH" | base64 --decode > ${HOME}/../WinSign.p12 -# -# - name: Build UI and Assemble Installer -# run: powershell -File .\Installer\build.ps1 + - uses: actions/checkout@master + - uses: NuGet/setup-nuget@v1.0.2 + - uses: microsoft/setup-msbuild@v1 + - name: Trying to run choco install. + run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) + - name: Install advanced installer + run: choco install advanced-installer wixtoolset --yes + - name: Restore nuget packages + run: nuget restore ZitiDesktopEdge.sln + + - name: Build UI and Assemble Installer + run: powershell -File .\Installer\build.ps1 From 1c5c87a9de491969ce8c5bf1dc3ae1d876e1b55e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 22:07:40 -0400 Subject: [PATCH 093/202] closer... --- .github/workflows/installer.build.yml | 4 ++-- Installer/ZitiDesktopEdge.aip | 2 +- Installer/build.ps1 | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 84ddac7c..5294e644 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -33,11 +33,11 @@ jobs: # BUILD_NUMBER: "Please Work" # - run: | - echo "${env:CODE} - ${env:SOME_KEY}" echo "${env:SOME_KEY}" > WinSign.b64 - C:\Windows\System32\certutil.exe -decode WinSign.b64 WinSign.p12 + C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 pwd dir + dir Installer - uses: actions/checkout@master - uses: NuGet/setup-nuget@v1.0.2 diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index b975027f..3fcfdc41 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -100,7 +100,7 @@ - + diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 0b57281f..e76b33f0 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -42,8 +42,6 @@ msbuild ZitiWintunInstaller.sln /p:configuration=Release Pop-Location -tree - $CMD = "$ENV:ADVINST_EXE" $CMD = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" $arg1 = '/build' From ab1c05c308cec143df3f9bbfbd58e8d3b7f65895 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 22:53:31 -0400 Subject: [PATCH 094/202] try more --- .github/workflows/installer.build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 5294e644..241f8c9e 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,6 +20,9 @@ jobs: CODE: ${{ github.workspace }}/go/src/github.com/${{ github.repository }} SOME_KEY: ${{ secrets.SOME_KEY }} steps: + - uses: actions/checkout@master + - uses: NuGet/setup-nuget@v1.0.2 + - uses: microsoft/setup-msbuild@v1 # - shell: pwsh # env: # SUPER_SECRET: ${{ secrets.SOME_KEY }} @@ -38,10 +41,6 @@ jobs: pwd dir dir Installer - - - uses: actions/checkout@master - - uses: NuGet/setup-nuget@v1.0.2 - - uses: microsoft/setup-msbuild@v1 - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - name: Install advanced installer From 17714da2c5c4bf5518f3469d36d6de97454ae495 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 23:31:04 -0400 Subject: [PATCH 095/202] try more --- .github/workflows/installer.build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 241f8c9e..7d9f4cbf 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -50,3 +50,9 @@ jobs: - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 + + - name: See if uploading an artifact will work... + uses: actions/upload-artifact@v2 + with: + name: Installer + path: "Installer\Output\Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file From de4510036d62e3ecd14d73d1023688da784ebe4d Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 23:31:33 -0400 Subject: [PATCH 096/202] try more --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 7d9f4cbf..fc91304d 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -55,4 +55,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: Installer - path: "Installer\Output\Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file + path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file From 6cb3d23c96d6be09c1444fbd9cea939396042f49 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 23:39:23 -0400 Subject: [PATCH 097/202] try more --- .github/workflows/installer.build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index fc91304d..84784c2c 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -47,10 +47,8 @@ jobs: run: choco install advanced-installer wixtoolset --yes - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln - - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 - - name: See if uploading an artifact will work... uses: actions/upload-artifact@v2 with: From a6c6056378ec93d82b65ea511309f70d01ebfff3 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 23:40:26 -0400 Subject: [PATCH 098/202] try more --- .github/workflows/installer.build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 84784c2c..4ae3a553 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -21,7 +21,6 @@ jobs: SOME_KEY: ${{ secrets.SOME_KEY }} steps: - uses: actions/checkout@master - - uses: NuGet/setup-nuget@v1.0.2 - uses: microsoft/setup-msbuild@v1 # - shell: pwsh # env: From 45074cdb79dba961c2da530350fc0f8111f572ee Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Sun, 18 Oct 2020 23:57:51 -0400 Subject: [PATCH 099/202] try more --- .github/workflows/installer.build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 4ae3a553..7b5d5c38 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -19,6 +19,8 @@ jobs: CURDIR: ${{ github.workspace }} CODE: ${{ github.workspace }}/go/src/github.com/${{ github.repository }} SOME_KEY: ${{ secrets.SOME_KEY }} + ADV_INST_LICENSEKEY: ${{ secrets.ADV_INST_LICENSEKEY }} + steps: - uses: actions/checkout@master - uses: microsoft/setup-msbuild@v1 @@ -46,6 +48,9 @@ jobs: run: choco install advanced-installer wixtoolset --yes - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln + - name: Register Advanced Installer + run: | + "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register "${env:ADV_INST_LICENSEKEY}" - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 - name: See if uploading an artifact will work... From de34ac1d3d4f06b4587d1682cad5f6a141b39b10 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 00:03:32 -0400 Subject: [PATCH 100/202] try more --- .github/workflows/installer.build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 7b5d5c38..b492b3f1 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -12,8 +12,8 @@ env: CURDIR: ${{github.workspace}} jobs: - one: - name: New Name + build: + name: Build the Ziti Desktop Edge for Windows Installer Package runs-on: windows-latest env: CURDIR: ${{ github.workspace }} @@ -36,7 +36,8 @@ jobs: # env: # BUILD_NUMBER: "Please Work" # - - run: | + - name: Place signing key into proper location for installer + run: | echo "${env:SOME_KEY}" > WinSign.b64 C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 pwd @@ -50,7 +51,7 @@ jobs: run: nuget restore ZitiDesktopEdge.sln - name: Register Advanced Installer run: | - "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register "${env:ADV_INST_LICENSEKEY}" + "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com /register ${env:ADV_INST_LICENSEKEY}" - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 - name: See if uploading an artifact will work... From 0869d85ecffd225ed6f9dab90fb328d51f0abf44 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 00:07:24 -0400 Subject: [PATCH 101/202] try more --- .github/workflows/installer.build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index b492b3f1..5b3c94f9 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -40,9 +40,6 @@ jobs: run: | echo "${env:SOME_KEY}" > WinSign.b64 C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - pwd - dir - dir Installer - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - name: Install advanced installer @@ -54,8 +51,8 @@ jobs: "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com /register ${env:ADV_INST_LICENSEKEY}" - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 - - name: See if uploading an artifact will work... + - name: Upload installer onto job uses: actions/upload-artifact@v2 with: - name: Installer + name: ZitiDesktopEdgeClient path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file From b25e6ab6fde3510ef8b57dcaf4094182d2eae1ce Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 00:09:48 -0400 Subject: [PATCH 102/202] try more --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 5b3c94f9..64b4e21b 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -48,7 +48,7 @@ jobs: run: nuget restore ZitiDesktopEdge.sln - name: Register Advanced Installer run: | - "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com /register ${env:ADV_INST_LICENSEKEY}" + '"C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" "/register" "${env:ADV_INST_LICENSEKEY}"' - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 - name: Upload installer onto job From 4ca1b55348b57d6804bb245e94419a6d39305c9f Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 07:53:34 -0400 Subject: [PATCH 103/202] try more --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 64b4e21b..0fb66261 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -48,7 +48,7 @@ jobs: run: nuget restore ZitiDesktopEdge.sln - name: Register Advanced Installer run: | - '"C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" "/register" "${env:ADV_INST_LICENSEKEY}"' + C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com /register "${env:ADV_INST_LICENSEKEY}" 2>&1 - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 - name: Upload installer onto job From 34ccea6bd957fcaaa2809c8b714e3c07c464be78 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 07:58:51 -0400 Subject: [PATCH 104/202] another try --- .github/workflows/installer.build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 0fb66261..e347fb08 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -46,7 +46,8 @@ jobs: run: choco install advanced-installer wixtoolset --yes - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln - - name: Register Advanced Installer + - shell: + name: Register Advanced Installer run: | C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com /register "${env:ADV_INST_LICENSEKEY}" 2>&1 - name: Build UI and Assemble Installer From d68200e0ae266b9656b2dd7a1a9e90ac7baffb93 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 08:01:21 -0400 Subject: [PATCH 105/202] another try --- .github/workflows/installer.build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index e347fb08..b2ebb446 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -46,10 +46,10 @@ jobs: run: choco install advanced-installer wixtoolset --yes - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln - - shell: + - shell: cmd name: Register Advanced Installer run: | - C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com /register "${env:ADV_INST_LICENSEKEY}" 2>&1 + "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register "${env:ADV_INST_LICENSEKEY}" 2>&1 - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 - name: Upload installer onto job From fc5334106b60b70b810e8178bb67a4aadc604180 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 08:09:14 -0400 Subject: [PATCH 106/202] another try --- .github/workflows/installer.build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index b2ebb446..37211024 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -39,6 +39,8 @@ jobs: - name: Place signing key into proper location for installer run: | echo "${env:SOME_KEY}" > WinSign.b64 + echo "${env:ADV_INST_LICENSEKEY}" > registration.key + tail -c 5 registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) From 16ff3275d24dccea93a66c8368f1b877569b324b Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 08:14:52 -0400 Subject: [PATCH 107/202] another try --- .github/workflows/installer.build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 37211024..7715b035 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -46,6 +46,13 @@ jobs: run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - name: Install advanced installer run: choco install advanced-installer wixtoolset --yes + - name: Cache Chocolatey Dependencies + uses: actions/cache@v1 + with: + path: C:\ProgramData\chocolatey\lib + key: choco-cache-v1 + restore-keys: | + choco-cache-v1 - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln - shell: cmd From 59cc1bbceda3512fccdf3c822d972a72650aa930 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 08:16:16 -0400 Subject: [PATCH 108/202] another try --- .github/workflows/installer.build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 7715b035..81451494 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -40,7 +40,7 @@ jobs: run: | echo "${env:SOME_KEY}" > WinSign.b64 echo "${env:ADV_INST_LICENSEKEY}" > registration.key - tail -c 5 registration.key + head -c 5 registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) @@ -51,8 +51,8 @@ jobs: with: path: C:\ProgramData\chocolatey\lib key: choco-cache-v1 - restore-keys: | - choco-cache-v1 + restore-keys: | + choco-cache-v1 - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln - shell: cmd From 439c5b932e74faddaf3e0787ca1bf249b73044a5 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 08:27:54 -0400 Subject: [PATCH 109/202] another try --- .github/workflows/installer.build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 81451494..3b732530 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -41,6 +41,7 @@ jobs: echo "${env:SOME_KEY}" > WinSign.b64 echo "${env:ADV_INST_LICENSEKEY}" > registration.key head -c 5 registration.key + Get-FileHash .\registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) From 8d59bb388030f9e5c5db5dd2161968360afb75dc Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 08:29:49 -0400 Subject: [PATCH 110/202] another try --- .github/workflows/installer.build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 3b732530..85b8f582 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -43,10 +43,6 @@ jobs: head -c 5 registration.key Get-FileHash .\registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - - name: Trying to run choco install. - run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - - name: Install advanced installer - run: choco install advanced-installer wixtoolset --yes - name: Cache Chocolatey Dependencies uses: actions/cache@v1 with: @@ -54,6 +50,10 @@ jobs: key: choco-cache-v1 restore-keys: | choco-cache-v1 + - name: Trying to run choco install. + run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) + - name: Install advanced installer + run: choco install advanced-installer wixtoolset --yes - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln - shell: cmd From 1c92a735b0c27c6e93eac54071bf77ca88ee07a7 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 08:32:52 -0400 Subject: [PATCH 111/202] another try --- .github/workflows/installer.build.yml | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 85b8f582..d30b6963 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -43,27 +43,27 @@ jobs: head -c 5 registration.key Get-FileHash .\registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - - name: Cache Chocolatey Dependencies - uses: actions/cache@v1 - with: - path: C:\ProgramData\chocolatey\lib - key: choco-cache-v1 - restore-keys: | - choco-cache-v1 - - name: Trying to run choco install. - run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - - name: Install advanced installer - run: choco install advanced-installer wixtoolset --yes - - name: Restore nuget packages - run: nuget restore ZitiDesktopEdge.sln - - shell: cmd - name: Register Advanced Installer - run: | - "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register "${env:ADV_INST_LICENSEKEY}" 2>&1 - - name: Build UI and Assemble Installer - run: powershell -File .\Installer\build.ps1 - - name: Upload installer onto job - uses: actions/upload-artifact@v2 - with: - name: ZitiDesktopEdgeClient - path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file +# - name: Cache Chocolatey Dependencies +# uses: actions/cache@v1 +# with: +# path: C:\ProgramData\chocolatey\lib +# key: choco-cache-v1 +# restore-keys: | +# choco-cache-v1 +# - name: Trying to run choco install. +# run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) +# - name: Install advanced installer +# run: choco install advanced-installer wixtoolset --yes +# - name: Restore nuget packages +# run: nuget restore ZitiDesktopEdge.sln +# - shell: cmd +# name: Register Advanced Installer +# run: | +# "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register "${env:ADV_INST_LICENSEKEY}" 2>&1 +# - name: Build UI and Assemble Installer +# run: powershell -File .\Installer\build.ps1 +# - name: Upload installer onto job +# uses: actions/upload-artifact@v2 +# with: +# name: ZitiDesktopEdgeClient +# path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file From 3e657e080a6c318b8a92f1534e960a00021310a8 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 08:38:52 -0400 Subject: [PATCH 112/202] another try --- .github/workflows/installer.build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index d30b6963..3001bf69 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -39,10 +39,14 @@ jobs: - name: Place signing key into proper location for installer run: | echo "${env:SOME_KEY}" > WinSign.b64 + echo "${env:ADV_INST_LICENSEKEY}" > registration.b64 echo "${env:ADV_INST_LICENSEKEY}" > registration.key - head -c 5 registration.key - Get-FileHash .\registration.key + C:\Windows\System32\certutil.exe -decode registration.b64 registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 + head -c 4 registration.key + tail -c 4 registration.key + (Get-FileHash .\registration.txt).Hash + ls -r registration.key # - name: Cache Chocolatey Dependencies # uses: actions/cache@v1 # with: From c711c3645e300793f89f8d0c0fce4f973a12999a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 08:40:26 -0400 Subject: [PATCH 113/202] another try --- .github/workflows/installer.build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 3001bf69..75c1c98e 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -40,7 +40,6 @@ jobs: run: | echo "${env:SOME_KEY}" > WinSign.b64 echo "${env:ADV_INST_LICENSEKEY}" > registration.b64 - echo "${env:ADV_INST_LICENSEKEY}" > registration.key C:\Windows\System32\certutil.exe -decode registration.b64 registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 head -c 4 registration.key From e66e126f4683e3be62324bdc30bbb6d26939817d Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 08:41:32 -0400 Subject: [PATCH 114/202] another try --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 75c1c98e..a3b9e616 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -44,7 +44,7 @@ jobs: C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 head -c 4 registration.key tail -c 4 registration.key - (Get-FileHash .\registration.txt).Hash + (Get-FileHash .\registration.key).Hash ls -r registration.key # - name: Cache Chocolatey Dependencies # uses: actions/cache@v1 From 87baf472c8adcac9aec9c14db5c1df644e43da55 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 09:17:01 -0400 Subject: [PATCH 115/202] another try --- .github/workflows/installer.build.yml | 49 ++++++++++++++------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index a3b9e616..fefc074d 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -46,27 +46,28 @@ jobs: tail -c 4 registration.key (Get-FileHash .\registration.key).Hash ls -r registration.key -# - name: Cache Chocolatey Dependencies -# uses: actions/cache@v1 -# with: -# path: C:\ProgramData\chocolatey\lib -# key: choco-cache-v1 -# restore-keys: | -# choco-cache-v1 -# - name: Trying to run choco install. -# run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) -# - name: Install advanced installer -# run: choco install advanced-installer wixtoolset --yes -# - name: Restore nuget packages -# run: nuget restore ZitiDesktopEdge.sln -# - shell: cmd -# name: Register Advanced Installer -# run: | -# "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register "${env:ADV_INST_LICENSEKEY}" 2>&1 -# - name: Build UI and Assemble Installer -# run: powershell -File .\Installer\build.ps1 -# - name: Upload installer onto job -# uses: actions/upload-artifact@v2 -# with: -# name: ZitiDesktopEdgeClient -# path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file + - name: Cache Chocolatey Dependencies + uses: actions/cache@v1 + with: + path: C:\ProgramData\chocolatey\lib + key: choco-cache-v1 + restore-keys: | + choco-cache-v1 + - name: Trying to run choco install. + run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) + - name: Install advanced installer + run: choco install advanced-installer wixtoolset --yes + - name: Restore nuget packages + run: nuget restore ZitiDesktopEdge.sln + - shell: cmd + name: Register Advanced Installer + run: | + set /p ADV_REG_KEY=&1 + - name: Build UI and Assemble Installer + run: powershell -File .\Installer\build.ps1 + - name: Upload installer onto job + uses: actions/upload-artifact@v2 + with: + name: ZitiDesktopEdgeClient + path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file From eb694c364745ae8770a89420c446de319c90e5d9 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 09:20:51 -0400 Subject: [PATCH 116/202] another try --- .github/workflows/installer.build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index fefc074d..12e6bf8a 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -50,9 +50,9 @@ jobs: uses: actions/cache@v1 with: path: C:\ProgramData\chocolatey\lib - key: choco-cache-v1 + key: choco-cache-${{ hashFiles('**/dependencies.config') }} restore-keys: | - choco-cache-v1 + choco-cache- - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - name: Install advanced installer From 44c36d6dbfaf50f5a26763dda98ee100bca0e4c1 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 10:58:45 -0400 Subject: [PATCH 117/202] another try --- .github/workflows/installer.build.yml | 48 ++++++++++++++------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 12e6bf8a..294fdec9 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -46,28 +46,30 @@ jobs: tail -c 4 registration.key (Get-FileHash .\registration.key).Hash ls -r registration.key - - name: Cache Chocolatey Dependencies - uses: actions/cache@v1 - with: - path: C:\ProgramData\chocolatey\lib - key: choco-cache-${{ hashFiles('**/dependencies.config') }} - restore-keys: | - choco-cache- - - name: Trying to run choco install. - run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - - name: Install advanced installer - run: choco install advanced-installer wixtoolset --yes - - name: Restore nuget packages - run: nuget restore ZitiDesktopEdge.sln - - shell: cmd +# - name: Cache Chocolatey Dependencies +# uses: actions/cache@v1 +# with: +# path: C:\ProgramData\chocolatey\lib +# key: choco-cache-${{ hashFiles('**/dependencies.config') }} +# restore-keys: | +# choco-cache- +# - name: Trying to run choco install. +# run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) +# - name: Install advanced installer +# run: choco install advanced-installer wixtoolset --yes +# - name: Restore nuget packages +# run: nuget restore ZitiDesktopEdge.sln + - shell: pwsh name: Register Advanced Installer run: | - set /p ADV_REG_KEY=&1 - - name: Build UI and Assemble Installer - run: powershell -File .\Installer\build.ps1 - - name: Upload installer onto job - uses: actions/upload-artifact@v2 - with: - name: ZitiDesktopEdgeClient - path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file + $key=(Get-Content .\registration.key) + "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" "/register" "$key" +# set /p ADV_REG_KEY=&1 +# - name: Build UI and Assemble Installer +# run: powershell -File .\Installer\build.ps1 +# - name: Upload installer onto job +# uses: actions/upload-artifact@v2 +# with: +# name: ZitiDesktopEdgeClient +# path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file From 205f0491d508129578b7d515b7e62c4526d0a073 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:04:55 -0400 Subject: [PATCH 118/202] add a bat file to register adv installer --- Installer/reg.bat | 1 + 1 file changed, 1 insertion(+) create mode 100644 Installer/reg.bat diff --git a/Installer/reg.bat b/Installer/reg.bat new file mode 100644 index 00000000..7dc8dbac --- /dev/null +++ b/Installer/reg.bat @@ -0,0 +1 @@ +"C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register %1 \ No newline at end of file From db2a8662ec830cc87250939908ae5281de48d0c5 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:05:39 -0400 Subject: [PATCH 119/202] another try --- .github/workflows/installer.build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 294fdec9..8403fc6e 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -63,7 +63,8 @@ jobs: name: Register Advanced Installer run: | $key=(Get-Content .\registration.key) - "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" "/register" "$key" + .\Installer\reg.bat testing +# "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" "/register" "$key" # set /p ADV_REG_KEY=&1 # - name: Build UI and Assemble Installer From 5d37ff59e05ade40795d10ff33b1d1de949120be Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:09:07 -0400 Subject: [PATCH 120/202] another try --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 8403fc6e..4093506c 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -63,7 +63,7 @@ jobs: name: Register Advanced Installer run: | $key=(Get-Content .\registration.key) - .\Installer\reg.bat testing + cmd /c "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register $key # "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" "/register" "$key" # set /p ADV_REG_KEY=&1 From f28439c5013fa2116cef542d627b83361ae25898 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:01:09 -0400 Subject: [PATCH 121/202] another try --- .github/workflows/installer.build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 4093506c..4d413e13 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,6 +20,7 @@ jobs: CODE: ${{ github.workspace }}/go/src/github.com/${{ github.repository }} SOME_KEY: ${{ secrets.SOME_KEY }} ADV_INST_LICENSEKEY: ${{ secrets.ADV_INST_LICENSEKEY }} + TEST_KEY: ${{ secrets.TEST_KEY }} steps: - uses: actions/checkout@master @@ -36,16 +37,14 @@ jobs: # env: # BUILD_NUMBER: "Please Work" # - - name: Place signing key into proper location for installer + - name: Setup secrets run: | echo "${env:SOME_KEY}" > WinSign.b64 echo "${env:ADV_INST_LICENSEKEY}" > registration.b64 + echo "${env:TEST_KEY}" > test.key C:\Windows\System32\certutil.exe -decode registration.b64 registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - head -c 4 registration.key - tail -c 4 registration.key - (Get-FileHash .\registration.key).Hash - ls -r registration.key + # - name: Cache Chocolatey Dependencies # uses: actions/cache@v1 # with: @@ -62,8 +61,9 @@ jobs: - shell: pwsh name: Register Advanced Installer run: | - $key=(Get-Content .\registration.key) - cmd /c "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register $key + $key=(Get-Content .\test.key) + .\Installer\reg.bat $key +# cmd /c "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register $key # "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" "/register" "$key" # set /p ADV_REG_KEY=&1 From 4e5684674623271cd36c4f4fb78a789db8d58e0e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:06:56 -0400 Subject: [PATCH 122/202] another try --- .github/workflows/installer.build.yml | 30 ++++++++++++++++----------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 4d413e13..65bdbbe0 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -44,18 +44,24 @@ jobs: echo "${env:TEST_KEY}" > test.key C:\Windows\System32\certutil.exe -decode registration.b64 registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - -# - name: Cache Chocolatey Dependencies -# uses: actions/cache@v1 -# with: -# path: C:\ProgramData\chocolatey\lib -# key: choco-cache-${{ hashFiles('**/dependencies.config') }} -# restore-keys: | -# choco-cache- -# - name: Trying to run choco install. -# run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) -# - name: Install advanced installer -# run: choco install advanced-installer wixtoolset --yes + - name: Cache Chocolatey Dependencies + uses: actions/cache@v1 + with: + path: C:\ProgramData\chocolatey + key: choco-cache-${{ hashFiles('**/dependencies.config') }} + restore-keys: | + choco-cache- + - name: Cache Advanced Installer + uses: actions/cache@v1 + with: + path: "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5" + key: adv-inst-17.5 + restore-keys: | + adv-inst-17.5 + - name: Trying to run choco install. + run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) + - name: Install advanced installer + run: choco install advanced-installer wixtoolset --yes # - name: Restore nuget packages # run: nuget restore ZitiDesktopEdge.sln - shell: pwsh From b91e847249e4532774202db4da3ad98d36590b29 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:17:06 -0400 Subject: [PATCH 123/202] another try --- .github/workflows/installer.build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 65bdbbe0..3c93d1d5 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -37,6 +37,15 @@ jobs: # env: # BUILD_NUMBER: "Please Work" # + - name: example env var? + run: echo "action_state=yellow" >> $GITHUB_ENV + - name: try adding a path to PATH? + run: echo "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5" >> $GITHUB_PATH + - name: output 'path' - default shell + run: path + - name: output 'path' - cmd shell + shell: cmd + run: path - name: Setup secrets run: | echo "${env:SOME_KEY}" > WinSign.b64 From c4020bb9922df67dc4f5d88ea4f0f4cc144fa642 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:18:06 -0400 Subject: [PATCH 124/202] another try --- .github/workflows/installer.build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 3c93d1d5..988c80b1 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -40,7 +40,8 @@ jobs: - name: example env var? run: echo "action_state=yellow" >> $GITHUB_ENV - name: try adding a path to PATH? - run: echo "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5" >> $GITHUB_PATH + run: | + echo "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5" >> $GITHUB_PATH - name: output 'path' - default shell run: path - name: output 'path' - cmd shell From ba8bee720d22a488149fcc824ffed208ee974170 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:18:55 -0400 Subject: [PATCH 125/202] another try --- .github/workflows/installer.build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 988c80b1..1d950e25 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -40,8 +40,7 @@ jobs: - name: example env var? run: echo "action_state=yellow" >> $GITHUB_ENV - name: try adding a path to PATH? - run: | - echo "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5" >> $GITHUB_PATH + run: echo "C:\\Program Files (x86)\\Caphyon\\Advanced Installer 17.5" >> $GITHUB_PATH - name: output 'path' - default shell run: path - name: output 'path' - cmd shell From 5707f6b538a130ad183e0ee391c6fcc05d130f21 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:19:37 -0400 Subject: [PATCH 126/202] another try --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 1d950e25..905ef8a6 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -63,7 +63,7 @@ jobs: - name: Cache Advanced Installer uses: actions/cache@v1 with: - path: "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5" + path: "C:\\Program Files (x86)\\Caphyon\\Advanced Installer 17.5" key: adv-inst-17.5 restore-keys: | adv-inst-17.5 From 021d7758dc87e95db740d733f51ab6b295bf68c9 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:21:14 -0400 Subject: [PATCH 127/202] another try --- .github/workflows/installer.build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 905ef8a6..466f8c38 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -41,8 +41,6 @@ jobs: run: echo "action_state=yellow" >> $GITHUB_ENV - name: try adding a path to PATH? run: echo "C:\\Program Files (x86)\\Caphyon\\Advanced Installer 17.5" >> $GITHUB_PATH - - name: output 'path' - default shell - run: path - name: output 'path' - cmd shell shell: cmd run: path From c2a7bb1ba7d06d02aecdbd1b8054b173e0cddd1a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:26:57 -0400 Subject: [PATCH 128/202] another try --- .github/workflows/installer.build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 466f8c38..ba03efd5 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,6 +20,7 @@ jobs: CODE: ${{ github.workspace }}/go/src/github.com/${{ github.repository }} SOME_KEY: ${{ secrets.SOME_KEY }} ADV_INST_LICENSEKEY: ${{ secrets.ADV_INST_LICENSEKEY }} + ADV_INST_KEY: ${{ ADV_INST_KEY }} TEST_KEY: ${{ secrets.TEST_KEY }} steps: @@ -75,7 +76,7 @@ jobs: name: Register Advanced Installer run: | $key=(Get-Content .\test.key) - .\Installer\reg.bat $key + .\Installer\reg.bat $ADV_INST_KEY # cmd /c "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register $key # "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" "/register" "$key" # set /p ADV_REG_KEY= Date: Mon, 19 Oct 2020 13:27:37 -0400 Subject: [PATCH 129/202] another try --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index ba03efd5..69829fa1 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -20,7 +20,7 @@ jobs: CODE: ${{ github.workspace }}/go/src/github.com/${{ github.repository }} SOME_KEY: ${{ secrets.SOME_KEY }} ADV_INST_LICENSEKEY: ${{ secrets.ADV_INST_LICENSEKEY }} - ADV_INST_KEY: ${{ ADV_INST_KEY }} + ADV_INST_KEY: ${{ secrets.ADV_INST_KEY }} TEST_KEY: ${{ secrets.TEST_KEY }} steps: From 58b53191ac3a8d820aa3237d12ab0c207514b6b5 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:36:03 -0400 Subject: [PATCH 130/202] another try --- .github/workflows/installer.build.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 69829fa1..1e1c1f7a 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -38,8 +38,13 @@ jobs: # env: # BUILD_NUMBER: "Please Work" # - - name: example env var? - run: echo "action_state=yellow" >> $GITHUB_ENV + - name: example env vars? + run: | + echo "action_state=yellow" >> $GITHUB_ENV + echo "TEST_KEY=$TEST_KEY" >> $GITHUB_ENV + - name: echo env vars... + shell: cmd + run: echo "%TEST_KEY%" - name: try adding a path to PATH? run: echo "C:\\Program Files (x86)\\Caphyon\\Advanced Installer 17.5" >> $GITHUB_PATH - name: output 'path' - cmd shell @@ -50,6 +55,7 @@ jobs: echo "${env:SOME_KEY}" > WinSign.b64 echo "${env:ADV_INST_LICENSEKEY}" > registration.b64 echo "${env:TEST_KEY}" > test.key + echo "${env:ADV_INST_KEY}" > ADV_INST_KEY.key C:\Windows\System32\certutil.exe -decode registration.b64 registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - name: Cache Chocolatey Dependencies @@ -75,8 +81,8 @@ jobs: - shell: pwsh name: Register Advanced Installer run: | - $key=(Get-Content .\test.key) - .\Installer\reg.bat $ADV_INST_KEY + $key=(Get-Content .\ADV_INST_KEY.key) + .\Installer\reg.bat $key # cmd /c "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register $key # "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" "/register" "$key" # set /p ADV_REG_KEY= Date: Mon, 19 Oct 2020 13:48:39 -0400 Subject: [PATCH 131/202] another try --- .github/workflows/installer.build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 1e1c1f7a..0eaf1598 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -58,13 +58,6 @@ jobs: echo "${env:ADV_INST_KEY}" > ADV_INST_KEY.key C:\Windows\System32\certutil.exe -decode registration.b64 registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - - name: Cache Chocolatey Dependencies - uses: actions/cache@v1 - with: - path: C:\ProgramData\chocolatey - key: choco-cache-${{ hashFiles('**/dependencies.config') }} - restore-keys: | - choco-cache- - name: Cache Advanced Installer uses: actions/cache@v1 with: @@ -72,6 +65,13 @@ jobs: key: adv-inst-17.5 restore-keys: | adv-inst-17.5 + - name: Cache WiX Installer + uses: actions/cache@v1 + with: + path: "c:\\Program Files (x86)\\WiX Toolset v3.11" + key: wix-311 + restore-keys: | + wix-311 - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - name: Install advanced installer From 2a89f9ea9ea88d5fc52533369f8d462d7cbbd743 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:53:44 -0400 Subject: [PATCH 132/202] another try --- .github/workflows/installer.build.yml | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 0eaf1598..6943e8cb 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -58,20 +58,20 @@ jobs: echo "${env:ADV_INST_KEY}" > ADV_INST_KEY.key C:\Windows\System32\certutil.exe -decode registration.b64 registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - - name: Cache Advanced Installer - uses: actions/cache@v1 - with: - path: "C:\\Program Files (x86)\\Caphyon\\Advanced Installer 17.5" - key: adv-inst-17.5 - restore-keys: | - adv-inst-17.5 - - name: Cache WiX Installer - uses: actions/cache@v1 - with: - path: "c:\\Program Files (x86)\\WiX Toolset v3.11" - key: wix-311 - restore-keys: | - wix-311 +# - name: Cache Advanced Installer +# uses: actions/cache@v1 +# with: +# path: "C:\\Program Files (x86)\\Caphyon\\Advanced Installer 17.5" +# key: adv-inst-17.5 +# restore-keys: | +# adv-inst-17.5 +# - name: Cache WiX Installer +# uses: actions/cache@v1 +# with: +# path: "c:\\Program Files (x86)\\WiX Toolset v3.11" +# key: wix-311 +# restore-keys: | +# wix-311 - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - name: Install advanced installer @@ -87,10 +87,10 @@ jobs: # "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" "/register" "$key" # set /p ADV_REG_KEY=&1 -# - name: Build UI and Assemble Installer -# run: powershell -File .\Installer\build.ps1 -# - name: Upload installer onto job -# uses: actions/upload-artifact@v2 -# with: -# name: ZitiDesktopEdgeClient -# path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file + - name: Build UI and Assemble Installer + run: powershell -File .\Installer\build.ps1 + - name: Upload installer onto job + uses: actions/upload-artifact@v2 + with: + name: ZitiDesktopEdgeClient + path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file From cbb41a7c1dd15d95e07264504af9035a4652381a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:59:11 -0400 Subject: [PATCH 133/202] another try --- .github/workflows/installer.build.yml | 30 ++------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 6943e8cb..bf356964 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -26,18 +26,6 @@ jobs: steps: - uses: actions/checkout@master - uses: microsoft/setup-msbuild@v1 -# - shell: pwsh -# env: -# SUPER_SECRET: ${{ secrets.SOME_KEY }} -# run: | -# echo "$env:SUPER_SECRET" -# - name: Print new build number -# run: | -# echo "Build number is ${{ steps.buildnumber.outputs.build_number }}" -# echo "Build number is ${env:BUILD_NUMBER}" -# env: -# BUILD_NUMBER: "Please Work" -# - name: example env vars? run: | echo "action_state=yellow" >> $GITHUB_ENV @@ -58,26 +46,12 @@ jobs: echo "${env:ADV_INST_KEY}" > ADV_INST_KEY.key C:\Windows\System32\certutil.exe -decode registration.b64 registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 -# - name: Cache Advanced Installer -# uses: actions/cache@v1 -# with: -# path: "C:\\Program Files (x86)\\Caphyon\\Advanced Installer 17.5" -# key: adv-inst-17.5 -# restore-keys: | -# adv-inst-17.5 -# - name: Cache WiX Installer -# uses: actions/cache@v1 -# with: -# path: "c:\\Program Files (x86)\\WiX Toolset v3.11" -# key: wix-311 -# restore-keys: | -# wix-311 - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - name: Install advanced installer run: choco install advanced-installer wixtoolset --yes -# - name: Restore nuget packages -# run: nuget restore ZitiDesktopEdge.sln + - name: Restore nuget packages + run: nuget restore ZitiDesktopEdge.sln - shell: pwsh name: Register Advanced Installer run: | From 774786475d553de13128e99c516df4a7fce0fcdf Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 14:14:34 -0400 Subject: [PATCH 134/202] another try --- .github/workflows/installer.build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index bf356964..f916c2c7 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -66,5 +66,7 @@ jobs: - name: Upload installer onto job uses: actions/upload-artifact@v2 with: - name: ZitiDesktopEdgeClient - path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" \ No newline at end of file + name: ZitiDesktopEdgeClient-${version} + path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" + env: + version: Get-Content .\version \ No newline at end of file From 4b8e4995ed8f1ed50063a03c7703f661005e8519 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 14:42:06 -0400 Subject: [PATCH 135/202] another try --- .github/workflows/installer.build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index f916c2c7..cf71734c 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -57,12 +57,10 @@ jobs: run: | $key=(Get-Content .\ADV_INST_KEY.key) .\Installer\reg.bat $key -# cmd /c "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" /register $key -# "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" "/register" "$key" -# set /p ADV_REG_KEY=&1 - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 + - name: Set an output param for the version in the checkout + run: echo "::set-output name=version::$(Get-Content version)" - name: Upload installer onto job uses: actions/upload-artifact@v2 with: From f035917ca7b84017395a51ea078f7f78109fd6e8 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 14:49:35 -0400 Subject: [PATCH 136/202] good enough without the version baked in automatically for now... --- .github/workflows/installer.build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index cf71734c..51b90883 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -59,12 +59,10 @@ jobs: .\Installer\reg.bat $key - name: Build UI and Assemble Installer run: powershell -File .\Installer\build.ps1 - - name: Set an output param for the version in the checkout - run: echo "::set-output name=version::$(Get-Content version)" - name: Upload installer onto job uses: actions/upload-artifact@v2 with: - name: ZitiDesktopEdgeClient-${version} + name: ZitiDesktopEdgeClient path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" env: version: Get-Content .\version \ No newline at end of file From ae27dfc8ca1dbb2cabcef519c78209e7f55c983e Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 03:11:42 +0000 Subject: [PATCH 137/202] [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 f19c3115..1c1fe123 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.10" - Revision = "2cc1a23f1ca8" - Branch = "fix-ips-treated-as-dns" + Revision = "2aab9b43bfd0" + Branch = "release-1.2.10" BuildUser = "travis" - BuildDate = "2020-10-16 18:39:17" + BuildDate = "2020-10-20 03:07:49" ) From 144c074e150711cddbfd6f10305918c442bfbcae Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 23:13:28 -0400 Subject: [PATCH 138/202] truing all the branches to the pre-release branch --- service/ziti-tunnel/service/ipc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go index 49979d58..41a9ae56 100644 --- a/service/ziti-tunnel/service/ipc.go +++ b/service/ziti-tunnel/service/ipc.go @@ -799,7 +799,7 @@ func removeIdentity(out *json.Encoder, fingerprint string) { rts.RemoveByFingerprint(fingerprint) //remove the file from the filesystem - first verify it's the proper file - log.Debug("removing identity file for fingerprint %s at %s", id.FingerPrint, id.Path()) + log.Debugf("removing identity file for fingerprint %s at %s", id.FingerPrint, id.Path()) err = os.Remove(id.Path()) if err != nil { log.Warn("could not remove file: %s", config.Path()+id.FingerPrint+".json") From c7914ac21017eccec1dda1f0cfa032ca29d41b51 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 23:15:37 -0400 Subject: [PATCH 139/202] bump to 1.2.11 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 963ed7cf..c1147005 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.2.10 +1.2.11 From a4a60bc0abd83f69d50e161d6730e7b2e01a8b3d Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 23:16:55 -0400 Subject: [PATCH 140/202] build pre-releases for testing --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 51b90883..106f156c 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -4,7 +4,7 @@ on: push: branches: - installer - - '*issue-130*' + - 'release-*' env: BUILD_CONFIG: "Release" From 56ec6ecceeb6b87209650d30f86b6e960d2c8e99 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 19 Oct 2020 23:35:48 -0400 Subject: [PATCH 141/202] don't append newlines over and over --- update-versions.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update-versions.ps1 b/update-versions.ps1 index 793319c6..8740f5b8 100644 --- a/update-versions.ps1 +++ b/update-versions.ps1 @@ -4,8 +4,8 @@ echo " version: $v" echo "" $assemblyInfo="./DesktopEdge/Properties/AssemblyInfo.cs" echo "Replacing version in $assemblyInfo" -(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace '\d\.\d\.\d\.', "$v." | Set-Content -Path $assemblyInfo -Encoding UTF8 +(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace '\d\.\d\.\d\.', "$v." | Set-Content -Path $assemblyInfo -Encoding UTF8 -NoNewline $installer="./Installer/ZitiDesktopEdge.aip" echo "Replacing version in $installer" -(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="\d\.\d\.\d"', """ProductVersion"" Value=""${v}""" | Set-Content -Path $installer -Encoding UTF8 +(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="\d\.\d\.\d"', """ProductVersion"" Value=""${v}""" | Set-Content -Path $installer -Encoding UTF8 -NoNewline From 164a00e35e31182bfb2c8dca0dacfce0b478d957 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 00:04:07 -0400 Subject: [PATCH 142/202] update version line by line to see if it will stop adding newlines --- update-versions.ps1 | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/update-versions.ps1 b/update-versions.ps1 index 8740f5b8..d05e3818 100644 --- a/update-versions.ps1 +++ b/update-versions.ps1 @@ -2,10 +2,30 @@ echo "Obtaining version information from .\version" $v=(Get-Content -Path .\version) echo " version: $v" echo "" + +rm temp.cs -ErrorAction Ignore +rm temp.aip -ErrorAction Ignore + $assemblyInfo="./DesktopEdge/Properties/AssemblyInfo.cs" echo "Replacing version in $assemblyInfo" -(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace '\d\.\d\.\d\.', "$v." | Set-Content -Path $assemblyInfo -Encoding UTF8 -NoNewline +foreach($line in Get-Content $assemblyInfo) { + $l = $line -replace '\d*.\d*.\d*.0', "${v}.0" + echo $l >> temp.cs +} + +echo "copying temp.cs into $assemblyInfo" +rm $assemblyInfo +mv temp.cs $assemblyInfo +#(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace '\d*.\d*.\d*.0', "${v}.0" | Set-Content -Path $assemblyInfo -Encoding UTF8 -NoNewline $installer="./Installer/ZitiDesktopEdge.aip" -echo "Replacing version in $installer" -(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="\d\.\d\.\d"', """ProductVersion"" Value=""${v}""" | Set-Content -Path $installer -Encoding UTF8 -NoNewline +echo "Replacing version in $installer into temp.aip" +foreach($line in Get-Content $installer) { + $l = $line -replace '"ProductVersion" Value="\d*\.\d*\.\d*"', """ProductVersion"" Value=""${v}""" + echo $l >> temp.aip +} + +echo "copying temp.aip into $installer" +rm $installer +mv temp.aip $installer +#(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="\d\.\d\.\d"', """ProductVersion"" Value=""${v}""" | Set-Content -Path $installer -Encoding UTF8 -NoNewline From f93b55d4365f7cdf68d09558fdd7179ed80c8277 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:44:12 -0400 Subject: [PATCH 143/202] replacing content in a file should not be this hard with powershell... --- update-versions.ps1 | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/update-versions.ps1 b/update-versions.ps1 index d05e3818..f72fd825 100644 --- a/update-versions.ps1 +++ b/update-versions.ps1 @@ -7,25 +7,17 @@ rm temp.cs -ErrorAction Ignore rm temp.aip -ErrorAction Ignore $assemblyInfo="./DesktopEdge/Properties/AssemblyInfo.cs" -echo "Replacing version in $assemblyInfo" -foreach($line in Get-Content $assemblyInfo) { - $l = $line -replace '\d*.\d*.\d*.0', "${v}.0" - echo $l >> temp.cs -} - -echo "copying temp.cs into $assemblyInfo" -rm $assemblyInfo -mv temp.cs $assemblyInfo -#(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace '\d*.\d*.\d*.0', "${v}.0" | Set-Content -Path $assemblyInfo -Encoding UTF8 -NoNewline - +$assemblyInfoReplaced="${assemblyInfo}.replaced" $installer="./Installer/ZitiDesktopEdge.aip" -echo "Replacing version in $installer into temp.aip" -foreach($line in Get-Content $installer) { - $l = $line -replace '"ProductVersion" Value="\d*\.\d*\.\d*"', """ProductVersion"" Value=""${v}""" - echo $l >> temp.aip -} +$installerReplaced="${installer}.replaced" -echo "copying temp.aip into $installer" +echo "Replacing version in $assemblyInfo into $assemblyInfoReplaced" +(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace 'Version\("[0-9]*.[0-9]*.[0-9]*.0', "Version\(""${v}.0" | Set-Content -Encoding UTF8 -Path "$assemblyInfoReplaced" -NoNewline +rm $assemblyInfo +mv $assemblyInfoReplaced $assemblyInfo + +echo "Replacing version in $installer into $installerReplaced" +(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]\.[0-9]\.[0-9]"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline rm $installer -mv temp.aip $installer -#(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="\d\.\d\.\d"', """ProductVersion"" Value=""${v}""" | Set-Content -Path $installer -Encoding UTF8 -NoNewline +mv $installerReplaced $installer + From a3d5654a276add913abb3d96e7d04b476fa18c2b Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:44:37 -0400 Subject: [PATCH 144/202] remove trailing lines from AssemblyInfo.cs --- DesktopEdge/Properties/AssemblyInfo.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index ee3e9556..9c5e445a 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -53,6 +53,3 @@ using System.Windows; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.2.10.0")] [assembly: AssemblyFileVersion("1.2.10.0")] - - - From d096cda0dec1c5636711bae52df9d3c10b113a66 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:49:59 -0400 Subject: [PATCH 145/202] update version update information --- service/publish.bat | 2 +- update-versions.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/service/publish.bat b/service/publish.bat index e5e68552..313319ae 100644 --- a/service/publish.bat +++ b/service/publish.bat @@ -76,7 +76,7 @@ git status 2>&1 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 git add service/ziti-tunnel/version.go DesktopEdge/Properties/AssemblyInfo.cs Installer/ZitiDesktopEdge.aip complete: %ERRORLEVEL% @echo issuing commit git commit -m "[ci skip] committing updated version information" 2>&1 diff --git a/update-versions.ps1 b/update-versions.ps1 index f72fd825..671b205c 100644 --- a/update-versions.ps1 +++ b/update-versions.ps1 @@ -17,7 +17,7 @@ rm $assemblyInfo mv $assemblyInfoReplaced $assemblyInfo echo "Replacing version in $installer into $installerReplaced" -(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]\.[0-9]\.[0-9]"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline +(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]*\.[0-9]*\.[0-9]*"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline rm $installer mv $installerReplaced $installer From 72a37a0bb9450835bf6b8db4f2f054e0e2448b29 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:55:21 -0400 Subject: [PATCH 146/202] update travis file - should build on anything that isn't the 'installer' branch --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a8c0ac1b..2f9036b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,8 @@ go: os: - windows -branches: //first try at only building PR or branch push - updated to the first if on line 1 above +# first try at only building PR or branch push - updated to the first if on line 1 above +branches: except: - installer From 1a5b39100ba1a8cc63aa1b6eca5ba801bbc70dd2 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 12:01:31 +0000 Subject: [PATCH 147/202] [ci skip] committing updated version information --- 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 1c1fe123..b8ca98a6 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -20,9 +20,9 @@ package main const ( - Version = "1.2.10" - Revision = "2aab9b43bfd0" - Branch = "release-1.2.10" + Version = "1.2.11" + Revision = "342fc1db687e" + Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 03:07:49" + BuildDate = "2020-10-20 11:57:49" ) From 77983c3b953e9f775bfeea2743925f92dac654fb Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 08:01:58 -0400 Subject: [PATCH 148/202] forgot to call the update script --- service/build.bat | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/service/build.bat b/service/build.bat index 707a992b..6a52a176 100644 --- a/service/build.bat +++ b/service/build.bat @@ -20,6 +20,9 @@ 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 calling powershell script to update versions in UI and Installer +powershell -file ..\update-versions.ps1 echo version info generated goto QUICK @@ -72,7 +75,7 @@ if exist %TUNNELER_SDK_DIR% ( echo changing to %TUNNELER_SDK_DIR% cd %TUNNELER_SDK_DIR% - + echo current directory is %CD% - should be %TUNNELER_SDK_DIR% echo. echo git clone %REPO_URL% %TUNNELER_SDK_DIR% --recurse-submodules From c64f68c265fc07a5dc693100399b13fdc845a65c Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 12:08:38 +0000 Subject: [PATCH 149/202] [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 b8ca98a6..3df85f82 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "342fc1db687e" + Revision = "76637de56386" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 11:57:49" + BuildDate = "2020-10-20 12:04:44" ) From cceaa87c7ff95e94f0fd42c4181d394a4fda5ca5 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 08:35:08 -0400 Subject: [PATCH 150/202] add some 2>&1 and --no-progress --- .travis.yml | 2 +- service/build.bat | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f9036b5..30b57670 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ branches: # - "master" install: - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja --no-progress; 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/service/build.bat b/service/build.bat index 6a52a176..5dbfac62 100644 --- a/service/build.bat +++ b/service/build.bat @@ -13,17 +13,17 @@ IF "%1"=="quick" ( GOTO QUICK ) -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 fetching ziti-ci 2>&1 +call %SVC_ROOT_DIR%/../get-ziti-ci.bat 2>&1 +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 calling powershell script to update versions in UI and Installer -powershell -file ..\update-versions.ps1 -echo version info generated +echo calling powershell script to update versions in UI and Installer 2>&1 +powershell -file %ZITI_TUNNEL_WIN_ROOT%update-versions.ps1 2>&1 +echo version info generate 2>&1d goto QUICK :CLEAN From d12524b7a6c30512a1680164fd19529920798426 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 08:36:36 -0400 Subject: [PATCH 151/202] stray d pressed and saved --- service/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/build.bat b/service/build.bat index 5dbfac62..96735ab4 100644 --- a/service/build.bat +++ b/service/build.bat @@ -23,7 +23,7 @@ ziti-ci generate-build-info --noAddNoCommit --useVersion=false %SVC_ROOT_DIR%/zi echo calling powershell script to update versions in UI and Installer 2>&1 powershell -file %ZITI_TUNNEL_WIN_ROOT%update-versions.ps1 2>&1 -echo version info generate 2>&1d +echo version info generate 2>&1 goto QUICK :CLEAN From 3ed5926bd0eed248d6916aaad84be4ebb31a45ba Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 12:42:08 +0000 Subject: [PATCH 152/202] [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 3df85f82..52be604e 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "76637de56386" + Revision = "cb7f75806b80" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 12:04:44" + BuildDate = "2020-10-20 12:37:49" ) From 3e2c67cf7681ad93f67c65195a053e09047c1114 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 08:50:09 -0400 Subject: [PATCH 153/202] powershell won't run from bat - try calling it from .travis --- .travis.yml | 1 + service/build.bat | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 30b57670..c855e784 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,4 +23,5 @@ before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: + - powershell -file update-versions.ps1 - service/publish.bat diff --git a/service/build.bat b/service/build.bat index 96735ab4..42351358 100644 --- a/service/build.bat +++ b/service/build.bat @@ -21,8 +21,8 @@ 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 calling powershell script to update versions in UI and Installer 2>&1 -powershell -file %ZITI_TUNNEL_WIN_ROOT%update-versions.ps1 2>&1 +REM echo calling powershell script to update versions in UI and Installer 2>&1 +REM powershell -file %ZITI_TUNNEL_WIN_ROOT%update-versions.ps1 2>&1 echo version info generate 2>&1 goto QUICK From dae85bcef2d70654a58b3b09ec0156de8892ed8d Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 13:01:34 +0000 Subject: [PATCH 154/202] [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 52be604e..51b6ca79 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "cb7f75806b80" + Revision = "11b3312a4ca3" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 12:37:49" + BuildDate = "2020-10-20 12:57:41" ) From 57f9c02ea5dfbc252e961da1fc57704d3fa2e400 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:03:13 -0400 Subject: [PATCH 155/202] wheeeeee travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c855e784..5a6270a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,5 +23,5 @@ before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: - - powershell -file update-versions.ps1 + - powershell update-versions.ps1 - service/publish.bat From f42b5fbea8c60ad84f5b028102f0c66861a65bf2 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 13:09:21 +0000 Subject: [PATCH 156/202] [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 51b6ca79..4f93f978 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "11b3312a4ca3" + Revision = "7b2805af9ec6" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 12:57:41" + BuildDate = "2020-10-20 13:05:32" ) From 46f54fa1333954aa29883f0cef9eda3aa130029d Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:15:22 -0400 Subject: [PATCH 157/202] update travis to get versions updated automatically if needed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5a6270a9..7e6053fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,5 +23,5 @@ before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: - - powershell update-versions.ps1 + - pwsh ./update-versions.ps1 - service/publish.bat From 7860cc1755e978f8f8a106850cae70364b77d7d6 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 13:21:47 +0000 Subject: [PATCH 158/202] [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 4f93f978..5fda8f1d 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "7b2805af9ec6" + Revision = "34b53d7effe6" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 13:05:32" + BuildDate = "2020-10-20 13:17:53" ) From a3d774a5d084e8d1ba9a81fb7a5362e15ef0bf67 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:29:35 -0400 Subject: [PATCH 159/202] call set-ExecutionPolicy from install and try again --- .travis.yml | 2 +- service/build.bat | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e6053fd..6b39e6a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,10 @@ branches: install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y zip ninja --no-progress; fi + - PowerShell -Command 'Set-ExecutionPolicy -ExecutionPolicy RemoteSigned' before_script: - export GIT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) script: - - pwsh ./update-versions.ps1 - service/publish.bat diff --git a/service/build.bat b/service/build.bat index 42351358..96735ab4 100644 --- a/service/build.bat +++ b/service/build.bat @@ -21,8 +21,8 @@ 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 -REM echo calling powershell script to update versions in UI and Installer 2>&1 -REM powershell -file %ZITI_TUNNEL_WIN_ROOT%update-versions.ps1 2>&1 +echo calling powershell script to update versions in UI and Installer 2>&1 +powershell -file %ZITI_TUNNEL_WIN_ROOT%update-versions.ps1 2>&1 echo version info generate 2>&1 goto QUICK From ef082935d7f582f559ba1e359b371ca413ed02c6 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 13:35:51 +0000 Subject: [PATCH 160/202] [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 5fda8f1d..fa624253 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "34b53d7effe6" + Revision = "3b6bdd790c3f" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 13:17:53" + BuildDate = "2020-10-20 13:32:12" ) From 258e4b5c6f3411564b8217b25cda88813c9ac767 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 10:24:01 -0400 Subject: [PATCH 161/202] update travis to get versions updated automatically if needed --- update-versions.ps1 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/update-versions.ps1 b/update-versions.ps1 index 671b205c..e4b2f531 100644 --- a/update-versions.ps1 +++ b/update-versions.ps1 @@ -1,3 +1,4 @@ +echo "==================================== update-versions.ps1 begins ====================================" echo "Obtaining version information from .\version" $v=(Get-Content -Path .\version) echo " version: $v" @@ -13,11 +14,28 @@ $installerReplaced="${installer}.replaced" echo "Replacing version in $assemblyInfo into $assemblyInfoReplaced" (Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace 'Version\("[0-9]*.[0-9]*.[0-9]*.0', "Version\(""${v}.0" | Set-Content -Encoding UTF8 -Path "$assemblyInfoReplaced" -NoNewline + +echo "echoing content of $assemblyInfoReplaced" +(Get-Content -Encoding UTF8 -path $assemblyInfoReplaced -Raw) + rm $assemblyInfo mv $assemblyInfoReplaced $assemblyInfo +echo "echoing content of $assemblyInfo" +(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) + echo "Replacing version in $installer into $installerReplaced" (Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]*\.[0-9]*\.[0-9]*"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline + +echo "echoing content of $installerReplaced" +(Get-Content -Encoding UTF8 -path $installerReplaced -Raw) + rm $installer mv $installerReplaced $installer +echo "echoing content of $installer" +(Get-Content -Encoding UTF8 -path $installer -Raw) + +git status + +echo "==================================== update-versions.ps1 complete ====================================" \ No newline at end of file From 59f5e08e349ca265ca7ee014dfe8c9ce04973d9b Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 10:28:43 -0400 Subject: [PATCH 162/202] update travis to get versions updated automatically if needed --- update-versions.ps1 | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/update-versions.ps1 b/update-versions.ps1 index e4b2f531..186e8f06 100644 --- a/update-versions.ps1 +++ b/update-versions.ps1 @@ -14,28 +14,14 @@ $installerReplaced="${installer}.replaced" echo "Replacing version in $assemblyInfo into $assemblyInfoReplaced" (Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace 'Version\("[0-9]*.[0-9]*.[0-9]*.0', "Version\(""${v}.0" | Set-Content -Encoding UTF8 -Path "$assemblyInfoReplaced" -NoNewline - -echo "echoing content of $assemblyInfoReplaced" -(Get-Content -Encoding UTF8 -path $assemblyInfoReplaced -Raw) - rm $assemblyInfo mv $assemblyInfoReplaced $assemblyInfo -echo "echoing content of $assemblyInfo" -(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) - echo "Replacing version in $installer into $installerReplaced" (Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]*\.[0-9]*\.[0-9]*"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline - -echo "echoing content of $installerReplaced" -(Get-Content -Encoding UTF8 -path $installerReplaced -Raw) - rm $installer mv $installerReplaced $installer -echo "echoing content of $installer" -(Get-Content -Encoding UTF8 -path $installer -Raw) - git status echo "==================================== update-versions.ps1 complete ====================================" \ No newline at end of file From 4262c9871075962734de055e4f22f7dd44da8dda Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 14:30:31 +0000 Subject: [PATCH 163/202] [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 fa624253..1afb348d 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "3b6bdd790c3f" + Revision = "11ca02d293f1" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 13:32:12" + BuildDate = "2020-10-20 14:26:55" ) From b738dc3aebd83b6345adb0c0f6fce800cca296b4 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 10:46:18 -0400 Subject: [PATCH 164/202] closing in on getting version information updating on push --- service/build.bat | 4 ++- service/publish.bat | 71 +++++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 36 deletions(-) diff --git a/service/build.bat b/service/build.bat index 96735ab4..83db8408 100644 --- a/service/build.bat +++ b/service/build.bat @@ -1,4 +1,5 @@ @echo off + set CURDIR=%CD% set SVC_ROOT_DIR=%~dp0 set ZITI_TUNNEL_WIN_ROOT=%SVC_ROOT_DIR%..\ @@ -17,13 +18,14 @@ echo fetching ziti-ci 2>&1 call %SVC_ROOT_DIR%/../get-ziti-ci.bat 2>&1 echo ziti-ci has been retrieved. running: ziti-ci version 2>&1 ziti-ci version 2>&1 +echo "" 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 calling powershell script to update versions in UI and Installer 2>&1 powershell -file %ZITI_TUNNEL_WIN_ROOT%update-versions.ps1 2>&1 -echo version info generate 2>&1 +echo version info generated 2>&1 goto QUICK :CLEAN diff --git a/service/publish.bat b/service/publish.bat index 313319ae..464a886d 100644 --- a/service/publish.bat +++ b/service/publish.bat @@ -1,96 +1,97 @@ @echo off + set CURDIR=%CD% 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 +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 +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 +echo looking for key using: ssh-keygen -F github.com - expect to find it now! 2>&1 ssh-keygen -F github.com 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 +CALL :FAIL %ERRORLEVEL% "checkout failed" +echo git checkout %GIT_BRANCH% complete: %ERRORLEVEL% + call %SVC_ROOT_DIR%\build.bat SET ACTUAL_ERR=%ERRORLEVEL% if %ACTUAL_ERR% NEQ 0 ( @echo. - @echo call to build.bat failed with %ACTUAL_ERR% + echo call to build.bat failed with %ACTUAL_ERR% @echo. exit /b 1 ) else ( @echo. - @echo result of ninja build: %ACTUAL_ERR% + echo result of ninja build: %ACTUAL_ERR% ) IF "%GIT_BRANCH%"=="master" GOTO RELEASE -@echo Publishing to snapshot repo +echo Publishing to snapshot repo ziti-ci publish artifactory --groupId=ziti-tunnel-win.amd64.windows --artifactId=ziti-tunnel-win --version=%BUILD_VERSION%-SNAPSHOT --target=service/ziti-tunnel-win.zip 2>&1 REM ziti-ci publish artifactory --groupId=ziti-tunnel-win.amd64.windows --artifactId=ziti-tunnel-win --version=%BUILD_VERSION%-SNAPSHOT --target=service/ziti-tunnel-win.zip --classifier=%GIT_BRANCH% 2>&1 GOTO END :RELEASE -@echo Publishing release +echo Publishing release ziti-ci publish artifactory --groupId=ziti-tunnel-win.amd64.windows --artifactId=ziti-tunnel-win --version=%BUILD_VERSION% --target=service/ziti-tunnel-win.zip 2>&1 GOTO END :BUILD_VERSION_ERROR -@echo The build version environment variable was not set - cannot publish +echo The build version environment variable was not set - cannot publish exit /b 1 :FAIL IF %~1 NEQ 0 ( - @echo ================================================================ + echo ================================================================ @echo. - @echo FAILURE: - @echo %~2 + echo FAILURE: + echo %~2 @echo. - @echo ================================================================ + echo ================================================================ exit /b %~1 ) exit /b 0 :END -@echo publishing complete - committing version.go as ci -@echo changing back to: %CURDIR% +echo publishing complete - committing version.go as ci +echo changing back to: %CURDIR% cd %CURDIR% -@echo current dir: %CD% +echo current dir: %CD% -@echo configuring git - relies on build.bat successfully grabbing ziti-ci and build.bat updating service/ziti-tunnel/version.go +echo configuring git - relies on build.bat successfully grabbing ziti-ci and build.bat updating service/ziti-tunnel/version.go ziti-ci configure-git 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 -CALL :FAIL %ERRORLEVEL% "checkout failed" -@echo git checkout %GIT_BRANCH% complete: %ERRORLEVEL% - -@echo issuing status -@echo ======================================================== +echo issuing status +echo ======================================================== git status 2>&1 -git add service/ziti-tunnel/version.go 2>&1 +git add service/ziti-tunnel/version.go DesktopEdge/Properties/AssemblyInfo.cs Installer/ZitiDesktopEdge.aip 2>&1 CALL :FAIL %ERRORLEVEL% "git add failed" -@echo git add service/ziti-tunnel/version.go DesktopEdge/Properties/AssemblyInfo.cs Installer/ZitiDesktopEdge.aip complete: %ERRORLEVEL% +echo git add service/ziti-tunnel/version.go DesktopEdge/Properties/AssemblyInfo.cs Installer/ZitiDesktopEdge.aip complete: %ERRORLEVEL% -@echo issuing commit +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 ======================================================== -@echo issuing git push -@echo ======================================================== -@echo setting git config remote.url git@github.com:openziti/desktop-edge-win.git +echo git commit -m "[ci skip] committing updated version information" complete: %ERRORLEVEL% +echo ======================================================== +echo issuing git push +echo ======================================================== +echo setting git config remote.url git@github.com:openziti/desktop-edge-win.git git config remote.url git@github.com:openziti/desktop-edge-win.git 2>&1 git config --list 2>&1 dir github_deploy_key git push --verbose 2>&1 CALL :FAIL %ERRORLEVEL% "git push failed" -@echo git push complete: %ERRORLEVEL% -@echo publish script has completed +echo git push complete: %ERRORLEVEL% +echo publish script has completed From ef1dcb5065885f3f1f2a122181d952b23623fa3b Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 14:55:57 +0000 Subject: [PATCH 165/202] [ci skip] committing updated version information --- DesktopEdge/Properties/AssemblyInfo.cs | 4 ++-- Installer/ZitiDesktopEdge.aip | 2 +- service/ziti-tunnel/version.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index 9c5e445a..90a1046a 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // 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.10.0")] -[assembly: AssemblyFileVersion("1.2.10.0")] +[assembly: AssemblyVersion\("1.2.11.0")] +[assembly: AssemblyFileVersion\("1.2.11.0")] diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 3fcfdc41..7d48a44c 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -25,7 +25,7 @@ - + diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 1afb348d..bbbcc577 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "11ca02d293f1" + Revision = "d61041350550" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 14:26:55" + BuildDate = "2020-10-20 14:51:51" ) From 089cdb2730335a745551603eb13d8ef4b2c5f66d Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 10:58:27 -0400 Subject: [PATCH 166/202] fix string replacement for AssemblyInfo.cs and fix the version in the file --- DesktopEdge/Properties/AssemblyInfo.cs | 4 ++-- update-versions.ps1 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index 90a1046a..9c5e445a 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // 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.11.0")] -[assembly: AssemblyFileVersion\("1.2.11.0")] +[assembly: AssemblyVersion("1.2.10.0")] +[assembly: AssemblyFileVersion("1.2.10.0")] diff --git a/update-versions.ps1 b/update-versions.ps1 index 186e8f06..3ec258df 100644 --- a/update-versions.ps1 +++ b/update-versions.ps1 @@ -13,7 +13,7 @@ $installer="./Installer/ZitiDesktopEdge.aip" $installerReplaced="${installer}.replaced" echo "Replacing version in $assemblyInfo into $assemblyInfoReplaced" -(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace 'Version\("[0-9]*.[0-9]*.[0-9]*.0', "Version\(""${v}.0" | Set-Content -Encoding UTF8 -Path "$assemblyInfoReplaced" -NoNewline +(Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace 'Version\("[0-9]*.[0-9]*.[0-9]*.0', "Version(""${v}.0" | Set-Content -Encoding UTF8 -Path "$assemblyInfoReplaced" -NoNewline rm $assemblyInfo mv $assemblyInfoReplaced $assemblyInfo From 21063f8ae034efb69f32d56b485a7f236b695b71 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 15:07:50 +0000 Subject: [PATCH 167/202] [ci skip] committing updated version information --- DesktopEdge/Properties/AssemblyInfo.cs | 4 ++-- service/ziti-tunnel/version.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index 9c5e445a..dc5e6c1d 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // 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.10.0")] -[assembly: AssemblyFileVersion("1.2.10.0")] +[assembly: AssemblyVersion("1.2.11.0")] +[assembly: AssemblyFileVersion("1.2.11.0")] diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index bbbcc577..3c6aba68 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "d61041350550" + Revision = "089cdb273033" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 14:51:51" + BuildDate = "2020-10-20 15:03:59" ) From f71564172d7b70b2e02cc05c861fd141aa8792f6 Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Tue, 20 Oct 2020 16:25:07 +0100 Subject: [PATCH 168/202] Fix the hide on deactivation when not attached. --- DesktopEdge/MainWindow.xaml.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs index ec61e71c..7528db6c 100644 --- a/DesktopEdge/MainWindow.xaml.cs +++ b/DesktopEdge/MainWindow.xaml.cs @@ -74,11 +74,13 @@ namespace ZitiDesktopEdge { } private void MainWindow_Deactivated(object sender, EventArgs e) { + if (this._isAttached) { #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) { @@ -528,7 +530,7 @@ namespace ZitiDesktopEdge { } private void MainUI_Deactivated(object sender, EventArgs e) { - if (UIModel.HideOnLostFocus) { + if (this._isAttached) { #if DEBUG Debug.WriteLine("debug is enabled - windows pinned"); #else From 402993e209e4f10265530db2ac54548bdbad5274 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 11:39:54 -0400 Subject: [PATCH 169/202] use a wildcard to find the exe --- .github/workflows/installer.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 106f156c..b9b58c02 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -63,6 +63,6 @@ jobs: uses: actions/upload-artifact@v2 with: name: ZitiDesktopEdgeClient - path: "Installer/Output/Ziti Desktop Edge Client-1.2.10.exe" + path: "Installer/Output/Ziti Desktop Edge Client-*.exe" env: version: Get-Content .\version \ No newline at end of file From 6e93894c7a7aee178729bb99bfceda807465f6b7 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 15:59:24 +0000 Subject: [PATCH 170/202] [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 3c6aba68..16b6a279 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "089cdb273033" + Revision = "402993e209e4" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 15:03:59" + BuildDate = "2020-10-20 15:55:30" ) From 01ef0c3bf8794d08f820329fd856523ab56ce6bc Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 12:10:56 -0400 Subject: [PATCH 171/202] use advanced installer to update versions --- Installer/build.ps1 | 12 +++++------- update-versions.ps1 | 27 +++++++++++++++++++-------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index e76b33f0..8bed82b4 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -36,18 +36,16 @@ echo "Building the UI" #msbuild DesktopEdge\ZitiDesktopEdge.csproj /property:Configuration=Release msbuild ZitiDesktopEdge.sln /property:Configuration=Release - echo "Building the Wintun installer" msbuild ZitiWintunInstaller.sln /p:configuration=Release Pop-Location -$CMD = "$ENV:ADVINST_EXE" -$CMD = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" -$arg1 = '/build' -$arg2 = "${scriptPath}\ZitiDesktopEdge.aip" +$ADVINST = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" +$ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip" -echo "Assembling installer using AdvancedInstaller at: $CMD $arg1 $arg2" -& $CMD $arg1 $arg2 +$action = '/build' +echo "Assembling installer using AdvancedInstaller at: $ADVINST $action $ADVPROJECT" +& $ADVINST $arg1 $ADVPROJECT $ProgressPreference = 'Continue' \ No newline at end of file diff --git a/update-versions.ps1 b/update-versions.ps1 index 3ec258df..b715f3fc 100644 --- a/update-versions.ps1 +++ b/update-versions.ps1 @@ -1,6 +1,10 @@ echo "==================================== update-versions.ps1 begins ====================================" -echo "Obtaining version information from .\version" -$v=(Get-Content -Path .\version) +$invocation = (Get-Variable MyInvocation).Value +$scriptPath = Split-Path $invocation.MyCommand.Path +${scriptPath} + +echo "Obtaining version information from ${scriptPath}\version" +$v=(Get-Content -Path ${scriptPath}\version) echo " version: $v" echo "" @@ -9,18 +13,25 @@ rm temp.aip -ErrorAction Ignore $assemblyInfo="./DesktopEdge/Properties/AssemblyInfo.cs" $assemblyInfoReplaced="${assemblyInfo}.replaced" -$installer="./Installer/ZitiDesktopEdge.aip" -$installerReplaced="${installer}.replaced" echo "Replacing version in $assemblyInfo into $assemblyInfoReplaced" (Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace 'Version\("[0-9]*.[0-9]*.[0-9]*.0', "Version(""${v}.0" | Set-Content -Encoding UTF8 -Path "$assemblyInfoReplaced" -NoNewline rm $assemblyInfo mv $assemblyInfoReplaced $assemblyInfo -echo "Replacing version in $installer into $installerReplaced" -(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]*\.[0-9]*\.[0-9]*"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline -rm $installer -mv $installerReplaced $installer +$ADVINST = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" +$ADVPROJECT = "${scriptPath}\Installer\ZitiDesktopEdge.aip" + +$action = '/SetVersion' +echo "issuing $ADVINST /edit $ADVPROJECT $action $v - see https://www.advancedinstaller.com/user-guide/set-version.html" +& $ADVINST /edit $ADVPROJECT $action $v + +#$installer="./Installer/ZitiDesktopEdge.aip" +#$installerReplaced="${installer}.replaced" +#echo "Replacing version in $installer into $installerReplaced" +#(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]*\.[0-9]*\.[0-9]*"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline +#rm $installer +#mv $installerReplaced $installer git status From bafd8ba70486208f97422a30bc5aeb3f53da7e13 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 16:28:00 +0000 Subject: [PATCH 172/202] [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 16b6a279..bd9916d4 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "402993e209e4" + Revision = "d621b0e6ff69" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 15:55:30" + BuildDate = "2020-10-20 16:24:00" ) From e1ff140981bf622ca594372665b021bd72773cef Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 12:30:32 -0400 Subject: [PATCH 173/202] _sigh_ - this all needs to get unified into github - can't run the script from travis... --- Installer/build.ps1 | 4 ++++ update-versions.ps1 | 27 ++++++++------------------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 8bed82b4..320f73cf 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -44,6 +44,10 @@ Pop-Location $ADVINST = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" $ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip" +$action = '/SetVersion' +echo "issuing $ADVINST /edit $ADVPROJECT $action $v - see https://www.advancedinstaller.com/user-guide/set-version.html" +& $ADVINST /edit $ADVPROJECT $action $v + $action = '/build' echo "Assembling installer using AdvancedInstaller at: $ADVINST $action $ADVPROJECT" & $ADVINST $arg1 $ADVPROJECT diff --git a/update-versions.ps1 b/update-versions.ps1 index b715f3fc..3ec258df 100644 --- a/update-versions.ps1 +++ b/update-versions.ps1 @@ -1,10 +1,6 @@ echo "==================================== update-versions.ps1 begins ====================================" -$invocation = (Get-Variable MyInvocation).Value -$scriptPath = Split-Path $invocation.MyCommand.Path -${scriptPath} - -echo "Obtaining version information from ${scriptPath}\version" -$v=(Get-Content -Path ${scriptPath}\version) +echo "Obtaining version information from .\version" +$v=(Get-Content -Path .\version) echo " version: $v" echo "" @@ -13,25 +9,18 @@ rm temp.aip -ErrorAction Ignore $assemblyInfo="./DesktopEdge/Properties/AssemblyInfo.cs" $assemblyInfoReplaced="${assemblyInfo}.replaced" +$installer="./Installer/ZitiDesktopEdge.aip" +$installerReplaced="${installer}.replaced" echo "Replacing version in $assemblyInfo into $assemblyInfoReplaced" (Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace 'Version\("[0-9]*.[0-9]*.[0-9]*.0', "Version(""${v}.0" | Set-Content -Encoding UTF8 -Path "$assemblyInfoReplaced" -NoNewline rm $assemblyInfo mv $assemblyInfoReplaced $assemblyInfo -$ADVINST = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com" -$ADVPROJECT = "${scriptPath}\Installer\ZitiDesktopEdge.aip" - -$action = '/SetVersion' -echo "issuing $ADVINST /edit $ADVPROJECT $action $v - see https://www.advancedinstaller.com/user-guide/set-version.html" -& $ADVINST /edit $ADVPROJECT $action $v - -#$installer="./Installer/ZitiDesktopEdge.aip" -#$installerReplaced="${installer}.replaced" -#echo "Replacing version in $installer into $installerReplaced" -#(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]*\.[0-9]*\.[0-9]*"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline -#rm $installer -#mv $installerReplaced $installer +echo "Replacing version in $installer into $installerReplaced" +(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]*\.[0-9]*\.[0-9]*"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline +rm $installer +mv $installerReplaced $installer git status From faf20b1008d64fb6141b78fb6746f4fba698e8ae Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 16:45:30 +0000 Subject: [PATCH 174/202] [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 bd9916d4..6d7a1c31 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "d621b0e6ff69" + Revision = "d85af48711bc" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 16:24:00" + BuildDate = "2020-10-20 16:41:50" ) From 7e71a860596fdb9a47c13d557f5b751fc6ed3143 Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Tue, 20 Oct 2020 18:01:26 +0100 Subject: [PATCH 175/202] Fix List Heights --- DesktopEdge/IdentityDetails.xaml.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DesktopEdge/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs index b12083c9..c7183a37 100644 --- a/DesktopEdge/IdentityDetails.xaml.cs +++ b/DesktopEdge/IdentityDetails.xaml.cs @@ -85,10 +85,10 @@ namespace ZitiDesktopEdge { editor.IsLocked = true; ServiceList.Children.Add(editor); } - int sHeight = 36 * _identity.Services.Count; - if (sHeight > 200) sHeight = 200; - Debug.WriteLine("Height: " + ServiceRow.Height.Value.ToString()); - ServiceRow.Height = new GridLength((double)sHeight); + double newHeight = Application.Current.MainWindow.ActualHeight - 360; + ServiceRow.Height = new GridLength((double)newHeight); + MainDetailScroll.MaxHeight = newHeight; + MainDetailScroll.Height = newHeight; MainDetailScroll.Visibility = Visibility.Visible; ServiceTitle.Content = _identity.Services.Count + " SERVICES"; } else { From becdb3bb446788e71da26ad25f4d6a282411b1a7 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 17:14:46 +0000 Subject: [PATCH 176/202] [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 6d7a1c31..a68dd512 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "d85af48711bc" + Revision = "7e71a860596f" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 16:41:50" + BuildDate = "2020-10-20 17:10:53" ) From e67a62119f5308c21d6f8b4af0e717c7bf91513b Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 13:21:58 -0400 Subject: [PATCH 177/202] update ignore and set the installer to the proper version --- .gitignore | 1 + Installer/build.ps1 | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3365cc33..9fca1e12 100644 --- a/.gitignore +++ b/.gitignore @@ -265,3 +265,4 @@ ziti-tunnel-win.zip service/deps service/ziti.dll service/libuv.dll +ziti-tunnel-service.zip diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 320f73cf..791b4a4b 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -9,9 +9,10 @@ $x=[xml] @" $((Invoke-WebRequest https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/maven-metadata.xml).Content) "@ -$v = $x.metadata.versioning.release +$serviceVersion = $x.metadata.versioning.release +$installerVersion=(Get-Content -Path .\version) -$zipUrl = "https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/${v}/ziti-tunnel-win-${v}.zip" +$zipUrl = "https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/${serviceVersion}/ziti-tunnel-win-${serviceVersion}.zip" echo "Downloading zip file " echo " from: $zipUrl" @@ -45,8 +46,8 @@ $ADVINST = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\Advan $ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip" $action = '/SetVersion' -echo "issuing $ADVINST /edit $ADVPROJECT $action $v - see https://www.advancedinstaller.com/user-guide/set-version.html" -& $ADVINST /edit $ADVPROJECT $action $v +echo "issuing $ADVINST /edit $ADVPROJECT $action $installerVersion (service version: $serviceVersion) - see https://www.advancedinstaller.com/user-guide/set-version.html" +& $ADVINST /edit $ADVPROJECT $action $installerVersion $action = '/build' echo "Assembling installer using AdvancedInstaller at: $ADVINST $action $ADVPROJECT" From a4a12cef82018eb90cab2ed4bf6bc975ba8d19ba Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 20 Oct 2020 13:23:47 -0400 Subject: [PATCH 178/202] get rid of stray git status --- update-versions.ps1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/update-versions.ps1 b/update-versions.ps1 index 3ec258df..960c205a 100644 --- a/update-versions.ps1 +++ b/update-versions.ps1 @@ -22,6 +22,4 @@ echo "Replacing version in $installer into $installerReplaced" rm $installer mv $installerReplaced $installer -git status - echo "==================================== update-versions.ps1 complete ====================================" \ No newline at end of file From de43ceb410e10e8ebbefd0e141613558e95e227f Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 17:35:29 +0000 Subject: [PATCH 179/202] [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 a68dd512..7d5c7246 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "7e71a860596f" + Revision = "a4a12cef8201" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 17:10:53" + BuildDate = "2020-10-20 17:31:37" ) From e075de43371b56732cc909a8803e12c4c670577f Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 13:45:56 -0400 Subject: [PATCH 180/202] add an echo just to make things more clear and make CI go brrrr --- Installer/build.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 791b4a4b..1c82a4d1 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -1,3 +1,4 @@ +echo "========================== build.ps1 begins ==========================" echo "Cleaning previous build folder if it exists" rm .\build -r -fo -ErrorAction Ignore @@ -53,4 +54,5 @@ $action = '/build' echo "Assembling installer using AdvancedInstaller at: $ADVINST $action $ADVPROJECT" & $ADVINST $arg1 $ADVPROJECT -$ProgressPreference = 'Continue' \ No newline at end of file +$ProgressPreference = 'Continue' +echo "========================== build.ps1 competed ==========================" \ No newline at end of file From 0e621aba32e2f1ce2e0828e13df5fc7fec24ce05 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 17:56:33 +0000 Subject: [PATCH 181/202] [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 7d5c7246..df11543f 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "a4a12cef8201" + Revision = "e075de43371b" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 17:31:37" + BuildDate = "2020-10-20 17:52:39" ) From 1842cb4d452733990d7cf1798a2e9c321c448b09 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 14:01:35 -0400 Subject: [PATCH 182/202] fix the build by referencing the proper variable --- .github/workflows/installer.build.yml | 9 --------- Installer/build.ps1 | 5 +++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index b9b58c02..b3e6ca82 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -21,7 +21,6 @@ jobs: SOME_KEY: ${{ secrets.SOME_KEY }} ADV_INST_LICENSEKEY: ${{ secrets.ADV_INST_LICENSEKEY }} ADV_INST_KEY: ${{ secrets.ADV_INST_KEY }} - TEST_KEY: ${{ secrets.TEST_KEY }} steps: - uses: actions/checkout@master @@ -29,20 +28,12 @@ jobs: - name: example env vars? run: | echo "action_state=yellow" >> $GITHUB_ENV - echo "TEST_KEY=$TEST_KEY" >> $GITHUB_ENV - - name: echo env vars... - shell: cmd - run: echo "%TEST_KEY%" - name: try adding a path to PATH? run: echo "C:\\Program Files (x86)\\Caphyon\\Advanced Installer 17.5" >> $GITHUB_PATH - - name: output 'path' - cmd shell - shell: cmd - run: path - name: Setup secrets run: | echo "${env:SOME_KEY}" > WinSign.b64 echo "${env:ADV_INST_LICENSEKEY}" > registration.b64 - echo "${env:TEST_KEY}" > test.key echo "${env:ADV_INST_KEY}" > ADV_INST_KEY.key C:\Windows\System32\certutil.exe -decode registration.b64 registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 1c82a4d1..e06eb61c 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -28,6 +28,8 @@ echo " time to download: $milliseconds" echo "" echo "unzipping ziti-tunnel-service.zip to build\service\" +$ProgressPreference = 'Continue' + Expand-Archive -Verbose -Force -LiteralPath ziti-tunnel-service.zip "${scriptPath}\build\service\" Push-Location ${scriptPath}\.. @@ -52,7 +54,6 @@ echo "issuing $ADVINST /edit $ADVPROJECT $action $installerVersion (service vers $action = '/build' echo "Assembling installer using AdvancedInstaller at: $ADVINST $action $ADVPROJECT" -& $ADVINST $arg1 $ADVPROJECT +& $ADVINST $action $ADVPROJECT -$ProgressPreference = 'Continue' echo "========================== build.ps1 competed ==========================" \ No newline at end of file From 0a9d950e52228f29601b72ebe33243e12089f296 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 18:13:26 +0000 Subject: [PATCH 183/202] [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 df11543f..118d844b 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "e075de43371b" + Revision = "104ae9bea56f" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 17:52:39" + BuildDate = "2020-10-20 18:09:37" ) From fb12c8d2ec0f67b6eeb59340818ab78a53c452c5 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 20:31:25 -0400 Subject: [PATCH 184/202] testing commit to see if the git branch is available to a ps1 --- .github/workflows/installer.build.yml | 59 ++++++++++++++------------- .travis.yml | 1 + Installer/build2.ps1 | 1 + 3 files changed, 32 insertions(+), 29 deletions(-) create mode 100644 Installer/build2.ps1 diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index b3e6ca82..3788cbfb 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -3,7 +3,7 @@ name: Build Installer on: push: branches: - - installer + - master - 'release-*' env: @@ -28,32 +28,33 @@ jobs: - name: example env vars? run: | echo "action_state=yellow" >> $GITHUB_ENV - - name: try adding a path to PATH? - run: echo "C:\\Program Files (x86)\\Caphyon\\Advanced Installer 17.5" >> $GITHUB_PATH - - name: Setup secrets - run: | - echo "${env:SOME_KEY}" > WinSign.b64 - echo "${env:ADV_INST_LICENSEKEY}" > registration.b64 - echo "${env:ADV_INST_KEY}" > ADV_INST_KEY.key - C:\Windows\System32\certutil.exe -decode registration.b64 registration.key - C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - - name: Trying to run choco install. - run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - - name: Install advanced installer - run: choco install advanced-installer wixtoolset --yes - - name: Restore nuget packages - run: nuget restore ZitiDesktopEdge.sln - - shell: pwsh - name: Register Advanced Installer - run: | - $key=(Get-Content .\ADV_INST_KEY.key) - .\Installer\reg.bat $key + echo ("::set-env name=BRANCH_NAME1::" + $env:GITHUB_REF.replace('refs/heads/', '')) + $branchName = "${{github.ref}}".Split("/")["${{github.ref}}".Split("/").Length -1] + echo "::set-env name=CURRENT_BRANCH2::$(echo $branchName)" +# - name: Setup secrets +# run: | +# echo "${env:SOME_KEY}" > WinSign.b64 +# echo "${env:ADV_INST_LICENSEKEY}" > registration.b64 +# echo "${env:ADV_INST_KEY}" > ADV_INST_KEY.key +# C:\Windows\System32\certutil.exe -decode registration.b64 registration.key +# C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 +# - name: Trying to run choco install. +# run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) +# - name: Install advanced installer +# run: choco install advanced-installer wixtoolset --yes +# - name: Restore nuget packages +# run: nuget restore ZitiDesktopEdge.sln +# - shell: pwsh +# name: Register Advanced Installer +# run: | +# $key=(Get-Content .\ADV_INST_KEY.key) +# .\Installer\reg.bat $key - name: Build UI and Assemble Installer - run: powershell -File .\Installer\build.ps1 - - name: Upload installer onto job - uses: actions/upload-artifact@v2 - with: - name: ZitiDesktopEdgeClient - path: "Installer/Output/Ziti Desktop Edge Client-*.exe" - env: - version: Get-Content .\version \ No newline at end of file + run: powershell -File .\Installer\build2.ps1 +# - name: Upload installer onto job +# uses: actions/upload-artifact@v2 +# with: +# name: ZitiDesktopEdgeClient +# path: "Installer/Output/Ziti Desktop Edge Client-*.exe" +# env: +# version: Get-Content .\version \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 6b39e6a4..b8d3c6ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ os: branches: except: - installer + - release-* # only: # - "master" diff --git a/Installer/build2.ps1 b/Installer/build2.ps1 new file mode 100644 index 00000000..8fa5b33d --- /dev/null +++ b/Installer/build2.ps1 @@ -0,0 +1 @@ +env \ No newline at end of file From 7b944bf9f4a9700d1c77d3ed93190a5905d62c8f Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 20:42:38 -0400 Subject: [PATCH 185/202] testing --- Installer/build2.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installer/build2.ps1 b/Installer/build2.ps1 index 8fa5b33d..b46b3b8f 100644 --- a/Installer/build2.ps1 +++ b/Installer/build2.ps1 @@ -1 +1 @@ -env \ No newline at end of file +echo "the branch is $env:branch" \ No newline at end of file From f03688b31752d3e76bac0bbce4e0df0f497273b8 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 20:45:16 -0400 Subject: [PATCH 186/202] neuter the release note drafter --- .github/workflows/installer.build.yml | 4 +--- .github/workflows/release-drafter.yml | 1 - Installer/build2.ps1 | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 3788cbfb..b4f5715d 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -28,9 +28,7 @@ jobs: - name: example env vars? run: | echo "action_state=yellow" >> $GITHUB_ENV - echo ("::set-env name=BRANCH_NAME1::" + $env:GITHUB_REF.replace('refs/heads/', '')) - $branchName = "${{github.ref}}".Split("/")["${{github.ref}}".Split("/").Length -1] - echo "::set-env name=CURRENT_BRANCH2::$(echo $branchName)" + echo ("::set-env name=GIT_BRANCH::" + $env:GITHUB_REF.replace('refs/heads/', '')) # - name: Setup secrets # run: | # echo "${env:SOME_KEY}" > WinSign.b64 diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 60fd485e..d4dd0bb8 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -5,7 +5,6 @@ on: # branches to consider in the event; optional, defaults to all branches: - master - - release* jobs: update_release_draft: diff --git a/Installer/build2.ps1 b/Installer/build2.ps1 index b46b3b8f..5a649d8d 100644 --- a/Installer/build2.ps1 +++ b/Installer/build2.ps1 @@ -1 +1 @@ -echo "the branch is $env:branch" \ No newline at end of file +echo "the branch is $env:GIT_BRANCH" \ No newline at end of file From 49cc4f2796e0a6e973b2d106dcbdd7e9c1c32c6f Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 20:54:02 -0400 Subject: [PATCH 187/202] use 'latest' if not master, else use 'release' if master --- .github/workflows/installer.build.yml | 60 +++++++++++++-------------- .travis.yml | 10 ++--- Installer/build.ps1 | 15 ++++++- Installer/build2.ps1 | 1 - 4 files changed, 45 insertions(+), 41 deletions(-) delete mode 100644 Installer/build2.ps1 diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index b4f5715d..f08e3dc6 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -9,15 +9,12 @@ on: env: BUILD_CONFIG: "Release" BUILDNUMBER: ${{github.run_number}} - CURDIR: ${{github.workspace}} jobs: build: name: Build the Ziti Desktop Edge for Windows Installer Package runs-on: windows-latest env: - CURDIR: ${{ github.workspace }} - CODE: ${{ github.workspace }}/go/src/github.com/${{ github.repository }} SOME_KEY: ${{ secrets.SOME_KEY }} ADV_INST_LICENSEKEY: ${{ secrets.ADV_INST_LICENSEKEY }} ADV_INST_KEY: ${{ secrets.ADV_INST_KEY }} @@ -25,34 +22,33 @@ jobs: steps: - uses: actions/checkout@master - uses: microsoft/setup-msbuild@v1 - - name: example env vars? + - name: Set the GIT_BRANCH environment variable run: | - echo "action_state=yellow" >> $GITHUB_ENV echo ("::set-env name=GIT_BRANCH::" + $env:GITHUB_REF.replace('refs/heads/', '')) -# - name: Setup secrets -# run: | -# echo "${env:SOME_KEY}" > WinSign.b64 -# echo "${env:ADV_INST_LICENSEKEY}" > registration.b64 -# echo "${env:ADV_INST_KEY}" > ADV_INST_KEY.key -# C:\Windows\System32\certutil.exe -decode registration.b64 registration.key -# C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 -# - name: Trying to run choco install. -# run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) -# - name: Install advanced installer -# run: choco install advanced-installer wixtoolset --yes -# - name: Restore nuget packages -# run: nuget restore ZitiDesktopEdge.sln -# - shell: pwsh -# name: Register Advanced Installer -# run: | -# $key=(Get-Content .\ADV_INST_KEY.key) -# .\Installer\reg.bat $key - - name: Build UI and Assemble Installer - run: powershell -File .\Installer\build2.ps1 -# - name: Upload installer onto job -# uses: actions/upload-artifact@v2 -# with: -# name: ZitiDesktopEdgeClient -# path: "Installer/Output/Ziti Desktop Edge Client-*.exe" -# env: -# version: Get-Content .\version \ No newline at end of file + - name: Setup secrets + run: | + echo "${env:SOME_KEY}" > WinSign.b64 + echo "${env:ADV_INST_LICENSEKEY}" > registration.b64 + echo "${env:ADV_INST_KEY}" > ADV_INST_KEY.key + C:\Windows\System32\certutil.exe -decode registration.b64 registration.key + C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 + - name: Trying to run choco install. + run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) + - name: Install advanced installer + run: choco install advanced-installer wixtoolset --yes + - name: Restore nuget packages + run: nuget restore ZitiDesktopEdge.sln + - shell: pwsh + name: Register Advanced Installer + run: | + $key=(Get-Content .\ADV_INST_KEY.key) + .\Installer\reg.bat $key + - name: Build UI and Assemble Installer + run: powershell -File .\Installer\build.ps1 + - name: Upload installer onto job + uses: actions/upload-artifact@v2 + with: + name: ZitiDesktopEdgeClient + path: "Installer/Output/Ziti Desktop Edge Client-*.exe" + env: + version: Get-Content .\version diff --git a/.travis.yml b/.travis.yml index b8d3c6ff..9bde03f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,10 @@ os: - windows # first try at only building PR or branch push - updated to the first if on line 1 above -branches: - except: - - installer - - release-* - -# only: +#branches: +# except: +# - installer +## only: # - "master" install: diff --git a/Installer/build.ps1 b/Installer/build.ps1 index e06eb61c..a62a0066 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -3,14 +3,25 @@ echo "Cleaning previous build folder if it exists" rm .\build -r -fo -ErrorAction Ignore $invocation = (Get-Variable MyInvocation).Value -$scriptPath = Split-Path $invocation.MyCommand.Path +$scriptPath = Split-Path $invocation.MyCommand.Path ${scriptPath} $x=[xml] @" $((Invoke-WebRequest https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/maven-metadata.xml).Content) "@ -$serviceVersion = $x.metadata.versioning.release +echo "the branch is $env:GIT_BRANCH" + +$branch = git rev-parse --abbrev-ref HEAD + +if ($branch != 'master') { + #if the git command to get the branch fails - this is 'not master' use the 'latest' - else fetch the 'release' + $serviceVersion = $x.metadata.versioning.latest +} +else { + $serviceVersion = $x.metadata.versioning.release +} +echo "service version is: $serviceVersion" $installerVersion=(Get-Content -Path .\version) $zipUrl = "https://netfoundry.jfrog.io/artifactory/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/${serviceVersion}/ziti-tunnel-win-${serviceVersion}.zip" diff --git a/Installer/build2.ps1 b/Installer/build2.ps1 deleted file mode 100644 index 5a649d8d..00000000 --- a/Installer/build2.ps1 +++ /dev/null @@ -1 +0,0 @@ -echo "the branch is $env:GIT_BRANCH" \ No newline at end of file From 9006287f272e234ab3f797dc5d31cd0f614455eb Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 20:57:01 -0400 Subject: [PATCH 188/202] yaml... geesh --- .github/workflows/installer.build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index f08e3dc6..cd94f47e 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -43,8 +43,8 @@ jobs: run: | $key=(Get-Content .\ADV_INST_KEY.key) .\Installer\reg.bat $key - - name: Build UI and Assemble Installer - run: powershell -File .\Installer\build.ps1 + - name: Build UI and Assemble Installer + run: powershell -File .\Installer\build.ps1 - name: Upload installer onto job uses: actions/upload-artifact@v2 with: From ea28624196ff1c01ee47593441655f914fbe9a43 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 21:02:04 -0400 Subject: [PATCH 189/202] let's see how far building the service on github can get --- .github/workflows/installer.build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index cd94f47e..779ded73 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -34,8 +34,10 @@ jobs: C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - - name: Install advanced installer - run: choco install advanced-installer wixtoolset --yes + - name: "Install Choco needs: advanced-installer wixtoolset zip ninja" + run: choco install advanced-installer wixtoolset zip ninja --yes + - name: Build the Service + run: service/publish.bat - name: Restore nuget packages run: nuget restore ZitiDesktopEdge.sln - shell: pwsh From d4f810186fa2a9f4f6d9292db56761a6c7aa2f52 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 21:03:13 -0400 Subject: [PATCH 190/202] use -ne for not equal --- Installer/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index a62a0066..dce113bc 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -14,7 +14,7 @@ echo "the branch is $env:GIT_BRANCH" $branch = git rev-parse --abbrev-ref HEAD -if ($branch != 'master') { +if ("$branch" -ne 'master') { #if the git command to get the branch fails - this is 'not master' use the 'latest' - else fetch the 'release' $serviceVersion = $x.metadata.versioning.latest } From 96b3c89e336ec0e6a850e99023c0244a19256ff5 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 21 Oct 2020 01:03:26 +0000 Subject: [PATCH 191/202] [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 118d844b..2c9ef67c 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "104ae9bea56f" + Revision = "9006287f272e" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-20 18:09:37" + BuildDate = "2020-10-21 00:59:31" ) From 7ec5c089c2ccd38e874c85628f32316a07d06acc Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 21 Oct 2020 01:11:11 +0000 Subject: [PATCH 192/202] [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 2c9ef67c..e5c9903f 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "9006287f272e" + Revision = "ca48093f49f1" Branch = "release-1.2.11" BuildUser = "travis" - BuildDate = "2020-10-21 00:59:31" + BuildDate = "2020-10-21 01:07:16" ) From 472e9ed2f4627422c35f955f41ca9ccdd0d83fea Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 21:25:34 -0400 Subject: [PATCH 193/202] try to get github to not CI bomb --- service/publish.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/publish.bat b/service/publish.bat index 464a886d..41213d9c 100644 --- a/service/publish.bat +++ b/service/publish.bat @@ -80,7 +80,7 @@ CALL :FAIL %ERRORLEVEL% "git add failed" echo git add service/ziti-tunnel/version.go DesktopEdge/Properties/AssemblyInfo.cs Installer/ZitiDesktopEdge.aip complete: %ERRORLEVEL% echo issuing commit -git commit -m "[ci skip] committing updated version information" 2>&1 +git commit -m "[ci skip] - [***NO_CI***] [skip ci] committing updated version information" 2>&1 CALL :FAIL %ERRORLEVEL% "git commit failed" echo git commit -m "[ci skip] committing updated version information" complete: %ERRORLEVEL% From c0b783aa473851a6065301c66b840879b23ac074 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 23:12:32 -0400 Subject: [PATCH 194/202] add gopath/bin to path --- .github/workflows/installer.build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 779ded73..493e05f7 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -22,9 +22,11 @@ jobs: steps: - uses: actions/checkout@master - uses: microsoft/setup-msbuild@v1 - - name: Set the GIT_BRANCH environment variable + - name: Set GIT_BRANCH and add GOPATH/bin to PATH run: | echo ("::set-env name=GIT_BRANCH::" + $env:GITHUB_REF.replace('refs/heads/', '')) + echo "::set-env name=GOPATH::$(go env GOPATH)" + echo "::add-path::$(go env GOPATH)/bin" - name: Setup secrets run: | echo "${env:SOME_KEY}" > WinSign.b64 From cc867444ff3562e884135bc88b86512270734568 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 21 Oct 2020 03:21:35 +0000 Subject: [PATCH 195/202] [ci skip] - [***NO_CI***] [skip ci] 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 e5c9903f..127c0f3e 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "ca48093f49f1" + Revision = "458b615431e8" Branch = "release-1.2.11" - BuildUser = "travis" - BuildDate = "2020-10-21 01:07:16" + BuildUser = "" + BuildDate = "2020-10-21 03:17:49" ) From 014ce822753f298418ffe925f590eb690c356ba8 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 23:31:57 -0400 Subject: [PATCH 196/202] try release drafter again --- .github/release-drafter.yml | 2 +- .github/workflows/release-drafter.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index ae11aac5..8d780bad 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,4 +1,4 @@ -me-template: 'v$RESOLVED_VERSION' +name-template: 'v$RESOLVED_VERSION' tag-template: 'v$RESOLVED_VERSION' categories: - title: 'Features' diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index d4dd0bb8..60fd485e 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -5,6 +5,7 @@ on: # branches to consider in the event; optional, defaults to all branches: - master + - release* jobs: update_release_draft: From 3686c7aef7acdf2ab0890662e31a423bb3551daf Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 23:42:52 -0400 Subject: [PATCH 197/202] update the echo to reflect the command that's run --- service/publish.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/publish.bat b/service/publish.bat index 41213d9c..a8323834 100644 --- a/service/publish.bat +++ b/service/publish.bat @@ -83,7 +83,7 @@ echo issuing commit git commit -m "[ci skip] - [***NO_CI***] [skip ci] 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 git commit -m "[ci skip] - [***NO_CI***] [skip ci] committing updated version information"" complete: %ERRORLEVEL% echo ======================================================== echo issuing git push echo ======================================================== From b763b9574d0d3bb2b8593186cbb9b1d74a287ba0 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 20 Oct 2020 23:44:55 -0400 Subject: [PATCH 198/202] cleanup the github workflow --- .github/workflows/installer.build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 493e05f7..452bb490 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -16,7 +16,6 @@ jobs: runs-on: windows-latest env: SOME_KEY: ${{ secrets.SOME_KEY }} - ADV_INST_LICENSEKEY: ${{ secrets.ADV_INST_LICENSEKEY }} ADV_INST_KEY: ${{ secrets.ADV_INST_KEY }} steps: @@ -30,9 +29,7 @@ jobs: - name: Setup secrets run: | echo "${env:SOME_KEY}" > WinSign.b64 - echo "${env:ADV_INST_LICENSEKEY}" > registration.b64 echo "${env:ADV_INST_KEY}" > ADV_INST_KEY.key - C:\Windows\System32\certutil.exe -decode registration.b64 registration.key C:\Windows\System32\certutil.exe -decode WinSign.b64 Installer/WinSign.p12 - name: Trying to run choco install. run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) From 7cbc0e4cf3f104347a86083d70507279a139f65b Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 21 Oct 2020 03:51:29 +0000 Subject: [PATCH 199/202] [ci skip] - [***NO_CI***] [skip ci] 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 127c0f3e..52be0b37 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "458b615431e8" + Revision = "b763b9574d0d" Branch = "release-1.2.11" - BuildUser = "" - BuildDate = "2020-10-21 03:17:49" + BuildUser = "travis" + BuildDate = "2020-10-21 03:47:41" ) From 0d41611dd5388573cd219d99f8478a3e698b2112 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 21 Oct 2020 04:01:38 +0000 Subject: [PATCH 200/202] [ci skip] - [***NO_CI***] [skip ci] 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 52be0b37..1e41a18b 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "b763b9574d0d" + Revision = "7cbc0e4cf3f1" Branch = "release-1.2.11" - BuildUser = "travis" - BuildDate = "2020-10-21 03:47:41" + BuildUser = "" + BuildDate = "2020-10-21 03:57:39" ) From 396accde3865c78db24904ae4d8ed965bec80bb1 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 21 Oct 2020 00:28:10 -0400 Subject: [PATCH 201/202] update release notes --- release-notes-service.md | 119 ------------------------------- release-notes.md | 150 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 146 insertions(+), 123 deletions(-) delete mode 100644 release-notes-service.md diff --git a/release-notes-service.md b/release-notes-service.md deleted file mode 100644 index 1dad7035..00000000 --- a/release-notes-service.md +++ /dev/null @@ -1,119 +0,0 @@ -These release notes will catalog the changes in the Windows service. -For UI changes or installer changes see [release-notes.md]() - -# Release 0.0.30 - -* What's New - - * Continually improved logging - * changed ip from 169.254.0.0/16 to 100.64.0.0/10 - * [#120](https://github.com/openziti/desktop-edge-win/issues/120) - Allow UI/client to get and set log level dynamically via ipc - -* Bug fixes - - * [#116](https://github.com/openziti/desktop-edge-win/issues/116) - Removes information from the config that wasn't needed in config.json - -# Release 0.0.29 - -* What's New - - * Continually improved logging - * Add support for 'verbose' logging along with error, warn, info, debug, trace - -* Bug fixes - - * [#123](https://github.com/openziti/desktop-edge-win/issues/123) - ConnectionSpecificDomains cause DNS lookup failures - * [#117](https://github.com/openziti/desktop-edge-win/issues/117) - TLD were not resolving properly - fixed in 0.0.28 but marking resolved in 0.0.29 - -# Release 0.0.28 - -* What's New - - * Continually improved logging - * Better DNS removal when services are no longer available or when an identity is removed - -* Bug fixes - - * [#106](https://github.com/openziti/desktop-edge-win/issues/106) - DNS stops responding when changing wireless networks - * [#121](https://github.com/openziti/desktop-edge-win/issues/121) - DNS queries take a long time after a computer wakes from sleep - -# Release 0.0.27 - -* Bug fixes - - * [#119](https://github.com/openziti/desktop-edge-win/issues/119) - Service would not start when IPv6 was disabled via the Windows registry - -# Release 0.0.24 - -* What's New - - * [#94](https://github.com/openziti/desktop-edge-win/issues/94) - Added support for 'hosted' services - -* Bug fixes - - * [#102](https://github.com/openziti/desktop-edge-win/pull/102) - DNS requests with "connection-specific local domain" would not resolve - -# Release 0.0.21-23 - nothing captured - -# Release 0.0.20 - -* What's New - - * Nothing yet - -* Bug fixes - - * [#85](https://github.com/openziti/desktop-edge-win/issues/85) - buffer DNS messages and panic/recover properly when network changes happen - -# Release 0.0.19 - -* What's New - - * Nothing yet - -* Bug fixes - - * [#82](https://github.com/openziti/desktop-edge-win/issues/82) - MTU was no longer sent to UI correctly - * [#86](https://github.com/openziti/desktop-edge-win/issues/86) - Inconsistent treatment of DNS requests - all requests will be treated as absolute going forward - * [#90](https://github.com/openziti/desktop-edge-win/issues/90) - UI will not reconnect to service if started before service - -# Release 0.0.18 - -* What's New - - * [#70](https://github.com/openziti/desktop-edge-win/issues/70) - Version added to api to report when model changes occur - -* Bug fixes - - * [#69](https://github.com/openziti/desktop-edge-win/issues/69) - reference counting for identities with access to the same service - -# Release 0.0.17 - -* What's New - - * [#70](https://github.com/openziti/desktop-edge-win/issues/70) - added api ApiVersion to TunnelStatusEvent - * [#71](https://github.com/openziti/desktop-edge-win/issues/71) - add .log to rolled over log files - -* Bug fixes - - * [#59](https://github.com/openziti/desktop-edge-win/issues/59) - too many services blocked service from accepting connections from the UI - * [#61](https://github.com/openziti/desktop-edge-win/issues/61) - identity shutdown needs to be on the uv loop (issue with forgetting identities) - * [#63](https://github.com/openziti/desktop-edge-win/issues/63) - when service restarts and UI reconnects clear identities and let the service repopulate the UI - * [#67](https://github.com/openziti/desktop-edge-win/issues/67) - set the MTU based on the value reported from the interface - -# Release 0.0.16 - -- tracking lost - -# Release 0.0.15 - -* What's New - -* Bug fixes - * [#51](https://github.com/openziti/desktop-edge-win/issues/51) - cziti log would never roll over. - now the cziti log rolls daily with a maximum of seven (7) log files - -# All versions prior to 0.0.15 - -Changelog tracking began with 0.0.15 - all previous changes were not tracked. If interested please -review the commit history. diff --git a/release-notes.md b/release-notes.md index 12b27a73..ab473b65 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,13 +1,38 @@ -These release notes will try to cover the changes made for the installer. For changes made -to the Windows service see [release-notes-service.md]() +# Release 1.2.11 + +* What's New + + * [#135](https://github.com/openziti/desktop-edge-win/pull/135) - Support added for IPv4 intercepting. + Services can now be created for any IPv4 address. + * [#123](https://github.com/openziti/desktop-edge-win/pull/123) - Windows can add ConnectionSpecificDomains + to DNS requests where no period (.) is in the DNS request such as "web-page" or "my-service". + These requests would not resolve properly because they would be received as "web-page.myConnectionSpecificDomain". + This now works correctly. + * [#131](https://github.com/openziti/desktop-edge-win/pull/131) - Installer added to GitHub Actions build. + +* Bug Fixes + + * [#130](https://github.com/openziti/desktop-edge-win/pull/130) - Detection of new release was inconsistent. + * [#129](https://github.com/openziti/desktop-edge-win/pull/129) - DNS entry was not removed when service was deleted. + +# Release 1.2.9 + +* What's New + + * adds support for Ziti-provided end to end encryption + * upgrades the Ziti Desktop Edge Service to version 0.0.30 + * the log level can now be changed from the UI by going to Advanced Settings -> Set Logging Level + * the config file has been slimmed + * the name used to start/stop the Ziti Desktop Edge Service has been made much more convenient. + Now you can start and stop the service with: `net start|stop ziti` (this is the change that + necessitates removing and reinstalling the application during upgrade from previous versions) # Release 1.2.6 * What's New * 'About' updated to reflect actual service version - * Added ability to set the log level of the service dynamically through Advanced Setttings - * + * Added ability to set the log level of the service dynamically through Advanced Settings * Bug fixes @@ -22,3 +47,120 @@ to the Windows service see [release-notes-service.md]() * Bug fixes * [#102](https://github.com/openziti/desktop-edge-win/pull/102) - DNS requests with "connection-specific local domain" would not resolve + +# Release 0.0.30 + +* What's New + + * Continually improved logging + * changed ip from 169.254.0.0/16 to 100.64.0.0/10 + * [#120](https://github.com/openziti/desktop-edge-win/issues/120) - Allow UI/client to get and set log level dynamically via ipc + +* Bug fixes + + * [#116](https://github.com/openziti/desktop-edge-win/issues/116) - Removes information from the config that wasn't needed in config.json + +# Release 0.0.29 + +* What's New + + * Continually improved logging + * Add support for 'verbose' logging along with error, warn, info, debug, trace + +* Bug fixes + + * [#123](https://github.com/openziti/desktop-edge-win/issues/123) - ConnectionSpecificDomains cause DNS lookup failures + * [#117](https://github.com/openziti/desktop-edge-win/issues/117) - TLD were not resolving properly - fixed in 0.0.28 but marking resolved in 0.0.29 + +# Release 0.0.28 + +* What's New + + * Continually improved logging + * Better DNS removal when services are no longer available or when an identity is removed + +* Bug fixes + + * [#106](https://github.com/openziti/desktop-edge-win/issues/106) - DNS stops responding when changing wireless networks + * [#121](https://github.com/openziti/desktop-edge-win/issues/121) - DNS queries take a long time after a computer wakes from sleep + +# Release 0.0.27 + +* Bug fixes + + * [#119](https://github.com/openziti/desktop-edge-win/issues/119) - Service would not start when IPv6 was disabled via the Windows registry + +# Release 0.0.24 + +* What's New + + * [#94](https://github.com/openziti/desktop-edge-win/issues/94) - Added support for 'hosted' services + +* Bug fixes + + * [#102](https://github.com/openziti/desktop-edge-win/pull/102) - DNS requests with "connection-specific local domain" would not resolve + +# Release 0.0.21-23 - nothing captured + +# Release 0.0.20 + +* What's New + + * Nothing yet + +* Bug fixes + + * [#85](https://github.com/openziti/desktop-edge-win/issues/85) - buffer DNS messages and panic/recover properly when network changes happen + +# Release 0.0.19 + +* What's New + + * Nothing yet + +* Bug fixes + + * [#82](https://github.com/openziti/desktop-edge-win/issues/82) - MTU was no longer sent to UI correctly + * [#86](https://github.com/openziti/desktop-edge-win/issues/86) - Inconsistent treatment of DNS requests - all requests will be treated as absolute going forward + * [#90](https://github.com/openziti/desktop-edge-win/issues/90) - UI will not reconnect to service if started before service + +# Release 0.0.18 + +* What's New + + * [#70](https://github.com/openziti/desktop-edge-win/issues/70) - Version added to api to report when model changes occur + +* Bug fixes + + * [#69](https://github.com/openziti/desktop-edge-win/issues/69) - reference counting for identities with access to the same service + +# Release 0.0.17 + +* What's New + + * [#70](https://github.com/openziti/desktop-edge-win/issues/70) - added api ApiVersion to TunnelStatusEvent + * [#71](https://github.com/openziti/desktop-edge-win/issues/71) - add .log to rolled over log files + +* Bug fixes + + * [#59](https://github.com/openziti/desktop-edge-win/issues/59) - too many services blocked service from accepting connections from the UI + * [#61](https://github.com/openziti/desktop-edge-win/issues/61) - identity shutdown needs to be on the uv loop (issue with forgetting identities) + * [#63](https://github.com/openziti/desktop-edge-win/issues/63) - when service restarts and UI reconnects clear identities and let the service repopulate the UI + * [#67](https://github.com/openziti/desktop-edge-win/issues/67) - set the MTU based on the value reported from the interface + +# Release 0.0.16 + +- tracking lost + +# Release 0.0.15 + +* What's New + +* Bug fixes + * [#51](https://github.com/openziti/desktop-edge-win/issues/51) - cziti log would never roll over. + now the cziti log rolls daily with a maximum of seven (7) log files + +# All versions prior to 0.0.15 + +Changelog tracking began with 0.0.15 - all previous changes were not tracked. If interested please +review the commit history. From f40158f74fdb75b270a0ee8a8cdf9f689c06df92 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 21 Oct 2020 04:35:52 +0000 Subject: [PATCH 202/202] [ci skip] - [***NO_CI***] [skip ci] 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 1e41a18b..2ab159c8 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.11" - Revision = "7cbc0e4cf3f1" + Revision = "62aef98d6c7f" Branch = "release-1.2.11" - BuildUser = "" - BuildDate = "2020-10-21 03:57:39" + BuildUser = "travis" + BuildDate = "2020-10-21 04:32:10" )