From 57399f3aff7ed64197781fdc27e7fbd6ba729e66 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Mon, 16 May 2022 17:40:09 -0400 Subject: [PATCH 1/4] Update deps and changelog --- CHANGELOG.md | 8 ++++++++ go.mod | 6 +++--- go.sum | 12 ++++++------ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a0e487c7..f400ea39f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Release 0.25.8 + +## Fabric + +### Bug Fixes + +* https://github.com/openziti/fabric/pull/403 + # Release 0.25.7 ## Fabric diff --git a/go.mod b/go.mod index d6e0472fe..c63e4f48a 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/michaelquigley/pfxlog v0.6.9 github.com/openziti/channel v0.18.36 github.com/openziti/edge v0.21.213 - github.com/openziti/fabric v0.17.134 + github.com/openziti/fabric v0.17.135 github.com/openziti/foundation v0.17.25 github.com/openziti/sdk-golang v0.16.68 github.com/openziti/storage v0.1.5 @@ -144,11 +144,11 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect go.mongodb.org/mongo-driver v1.8.3 // indirect go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect - golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 // indirect + golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 // indirect golang.org/x/image v0.0.0-20191206065243-da761ea9ff43 // indirect golang.org/x/mod v0.5.1 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect + golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.7 // indirect diff --git a/go.sum b/go.sum index a77c8f87b..973823618 100644 --- a/go.sum +++ b/go.sum @@ -639,8 +639,8 @@ github.com/openziti/dilithium v0.3.3 h1:PLgQ6PMNLSTzCFbX/h98cmudgz/cU6TmjdSv5NAP github.com/openziti/dilithium v0.3.3/go.mod h1:vsCjI2AU/hon9e+dLhUFbCNGesJDj2ASgkySOcpmvjo= github.com/openziti/edge v0.21.213 h1:cxKvKR9Wlc4/O8DYOn+iGydJu+NYU9qxVnM2T5kyH70= github.com/openziti/edge v0.21.213/go.mod h1:L6oJlJh8/4zNOLrooUzWKhWlGDRllec2wdKcHQ42HVk= -github.com/openziti/fabric v0.17.134 h1:S5Hh1HrH9DHCllRlKdclJgaU/bY6pgmXUOqrc0CH98M= -github.com/openziti/fabric v0.17.134/go.mod h1:6Yy/kSr3zl//g2RBAlXn/hrlMdG1IhzPlPf3SsCK1pA= +github.com/openziti/fabric v0.17.135 h1:I+wDG1Kz6V1/EFWUNzHWgGDRpFxHDqPPfLq8wx6bSqc= +github.com/openziti/fabric v0.17.135/go.mod h1:6Yy/kSr3zl//g2RBAlXn/hrlMdG1IhzPlPf3SsCK1pA= github.com/openziti/foundation v0.17.25 h1:s7E7LIYHGeJQQqmQI1uLA2Ml3L2dgGbeTN+rD6Woo78= github.com/openziti/foundation v0.17.25/go.mod h1:YMalQrbDP3S5ptEcob4v3F+pyCngabaG/hQVoT9Pcxo= github.com/openziti/sdk-golang v0.16.68 h1:40iL5BpYU9s4E4rJb7hiqs4xRXapRT61K9TQ99CWFyg= @@ -907,8 +907,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 h1:Tgea0cVUD0ivh5ADBX4WwuI12DUd2to3nCYe2eayMIw= -golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 h1:y+mHpWoQJNAHt26Nhh6JP7hvM71IRZureyvZhoVALIs= +golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1116,8 +1116,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60= -golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a h1:N2T1jUrTQE9Re6TFF5PhvEHXHCguynGhKjWVsIUt5cY= +golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= From 5b310ab62905307d21d1d3e2464d754c174879c4 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Mon, 16 May 2022 17:43:18 -0400 Subject: [PATCH 2/4] Move changelog entry to right place --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f400ea39f..1dcb073f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Release 0.25.8 +## Maintenance +Improved MacOS compatibility with cert handling and ioKit. + ## Fabric ### Bug Fixes @@ -130,9 +133,6 @@ link fault will be sent to all connected routers. The `ziti-probe` tool will no longer be built and published as part of Ziti releases. -## Maintenance -Improved MacOS compatibility with cert handling and ioKit. - ### Bug Fixes * https://github.com/openziti/fabric/issues/393 From 113595a522a85cdad2cacd901dc6bf463b302187 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Mon, 16 May 2022 18:32:58 -0400 Subject: [PATCH 3/4] Install jfrog directly instead of having ziti-ci do it --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 50802a717..220a137b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -132,6 +132,7 @@ jobs: # remaining steps in job only run on the upstream repo, not forks - name: Publish if: github.repository_owner == 'openziti' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-v')) + uses: jfrog/setup-jfrog-cli@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ziti_ci_gpg_key: ${{ secrets.ZITI_CI_GPG_KEY }} From 31cfffff0cdc9b67cae1ccf387346e966577fefe Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Mon, 16 May 2022 18:36:18 -0400 Subject: [PATCH 4/4] Fix jfrog install --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 220a137b6..7db4b257c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -129,10 +129,12 @@ jobs: name: windows-release-${{ github.run_id }} path: release/ + - name: Install Jfrog CLI + uses: jfrog/setup-jfrog-cli@v1 + # remaining steps in job only run on the upstream repo, not forks - name: Publish if: github.repository_owner == 'openziti' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-v')) - uses: jfrog/setup-jfrog-cli@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ziti_ci_gpg_key: ${{ secrets.ZITI_CI_GPG_KEY }}