From a1114367a60b74b3b503da75d4dfac285fa0bc00 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Mon, 21 Mar 2022 11:51:14 -0400 Subject: [PATCH] Fix panic on link bind. Add gpg signing bits to GH actions workflows --- .github/workflows/main.yml | 2 ++ .github/workflows/update-dependency.yml | 2 ++ router/xlink_transport/listener.go | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 07daa898f..cddcc45e1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,6 +31,8 @@ jobs: - name: Release env: gh_ci_key: ${{ secrets.GH_CI_KEY }} + ziti_ci_gpg_key: ${{ secrets.ZITI_CI_GPG_KEY }} + ziti_ci_gpg_key_id: ${{ secrets.ZITI_CI_GPG_KEY_ID }} if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-') run: | $(go env GOPATH)/bin/ziti-ci configure-git diff --git a/.github/workflows/update-dependency.yml b/.github/workflows/update-dependency.yml index bb5face22..b415e4509 100644 --- a/.github/workflows/update-dependency.yml +++ b/.github/workflows/update-dependency.yml @@ -27,6 +27,8 @@ jobs: - name: Update Dependency env: gh_ci_key: ${{ secrets.GH_CI_KEY }} + ziti_ci_gpg_key: ${{ secrets.ZITI_CI_GPG_KEY }} + ziti_ci_gpg_key_id: ${{ secrets.ZITI_CI_GPG_KEY_ID }} run: | $(go env GOPATH)/bin/ziti-ci configure-git $(go env GOPATH)/bin/ziti-ci update-go-dependency ${{ github.event.inputs.updated-dependency }} diff --git a/router/xlink_transport/listener.go b/router/xlink_transport/listener.go index cffb67684..409afc77e 100644 --- a/router/xlink_transport/listener.go +++ b/router/xlink_transport/listener.go @@ -123,7 +123,8 @@ func (self *listener) bindSplitChannel(binding channel.Binding, chanType channel xli, err := self.getOrCreateSplitLink(string(id), routerId, routerVersion, binding, chanType) if err != nil { - log.WithError(err).Error("erroring binding link channel") + log.WithError(err).Error("error binding link channel") + return err } latencyPing := chanType == PayloadChannel