From f1508e6fb99bc9ea123fc7126c4c2ef1ec34c502 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Fri, 19 Dec 2025 13:29:52 -0500 Subject: [PATCH] build and release machinery changes for -> github.com/openziti/zrok/v2 (#1124) --- .github/workflows/ci-build.yml | 2 +- .goreleaser-darwin.yml | 4 ++-- .goreleaser-linux-amd64.yml | 2 +- .goreleaser-linux-arm64.yml | 2 +- .goreleaser-linux-armel.yml | 2 +- .goreleaser-linux-armhf.yml | 2 +- .goreleaser-windows.yml | 2 +- ACKNOWLEDGEMENTS.md | 6 +++--- agent/agentGrpc/agent.pb.go | 6 +++--- agent/agentGrpc/agent_grpc.pb.go | 2 +- .../dynamicProxyController/dynamicProxyController.pb.go | 6 +++--- .../dynamicProxyController_grpc.pb.go | 2 +- docker/images/cross-build/linux-build.sh | 2 +- sdk/golang/pubsub/README.md | 8 ++++---- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 5c5937c4..ac8f2fba 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -55,7 +55,7 @@ jobs: - name: go install shell: bash - run: go install -ldflags "-X github.com/openziti/zrok/build.Version=${{ github.ref }} -X github.com/openziti/zrok/build.Hash=${{ github.sha }}" ./... + run: go install -ldflags "-X github.com/openziti/zrok/v2/build.Version=${{ github.ref }} -X github.com/openziti/zrok/v2/build.Hash=${{ github.sha }}" ./... - name: go test shell: bash diff --git a/.goreleaser-darwin.yml b/.goreleaser-darwin.yml index 9f7d29bd..264fce97 100644 --- a/.goreleaser-darwin.yml +++ b/.goreleaser-darwin.yml @@ -3,7 +3,7 @@ builds: - id: zrok-amd64 main: ./cmd/zrok binary: zrok - ldflags: "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}" + ldflags: "-s -w -X github.com/openziti/zrok/v2/build.Version={{.Tag}} -X github.com/openziti/zrok/v2/build.Hash={{.ShortCommit}}" env: - CGO_ENABLED=1 goos: @@ -21,7 +21,7 @@ builds: - id: zrok-arm64 main: ./cmd/zrok binary: zrok - ldflags: "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}" + ldflags: "-s -w -X github.com/openziti/zrok/v2/build.Version={{.Tag}} -X github.com/openziti/zrok/v2/build.Hash={{.ShortCommit}}" env: - CGO_ENABLED=1 goos: diff --git a/.goreleaser-linux-amd64.yml b/.goreleaser-linux-amd64.yml index 6dbc515b..6f6d456d 100644 --- a/.goreleaser-linux-amd64.yml +++ b/.goreleaser-linux-amd64.yml @@ -3,7 +3,7 @@ builds: - id: zrok-amd64 main: ./cmd/zrok binary: zrok - ldflags: "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}" + ldflags: "-s -w -X github.com/openziti/zrok/v2/build.Version={{.Tag}} -X github.com/openziti/zrok/v2/build.Hash={{.ShortCommit}}" env: - CGO_ENABLED=1 goos: diff --git a/.goreleaser-linux-arm64.yml b/.goreleaser-linux-arm64.yml index 37bdb639..185e0903 100644 --- a/.goreleaser-linux-arm64.yml +++ b/.goreleaser-linux-arm64.yml @@ -3,7 +3,7 @@ builds: - id: zrok-armv8 main: ./cmd/zrok binary: zrok - ldflags: "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}" + ldflags: "-s -w -X github.com/openziti/zrok/v2/build.Version={{.Tag}} -X github.com/openziti/zrok/v2/build.Hash={{.ShortCommit}}" env: - CC=aarch64-linux-gnu-gcc - CGO_ENABLED=1 diff --git a/.goreleaser-linux-armel.yml b/.goreleaser-linux-armel.yml index 5ed2aa3e..ac24c130 100644 --- a/.goreleaser-linux-armel.yml +++ b/.goreleaser-linux-armel.yml @@ -7,7 +7,7 @@ builds: main: ./cmd/zrok binary: zrok ldflags: - - "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}" + - "-s -w -X github.com/openziti/zrok/v2/build.Version={{.Tag}} -X github.com/openziti/zrok/v2/build.Hash={{.ShortCommit}}" env: - CC=arm-linux-gnueabi-gcc - CGO_ENABLED=1 diff --git a/.goreleaser-linux-armhf.yml b/.goreleaser-linux-armhf.yml index 781e980e..adf787b8 100644 --- a/.goreleaser-linux-armhf.yml +++ b/.goreleaser-linux-armhf.yml @@ -5,7 +5,7 @@ builds: main: ./cmd/zrok binary: zrok ldflags: - - "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}" + - "-s -w -X github.com/openziti/zrok/v2/build.Version={{.Tag}} -X github.com/openziti/zrok/v2/build.Hash={{.ShortCommit}}" env: - CC=arm-linux-gnueabihf-gcc - CGO_ENABLED=1 diff --git a/.goreleaser-windows.yml b/.goreleaser-windows.yml index deeda04c..d33ac157 100644 --- a/.goreleaser-windows.yml +++ b/.goreleaser-windows.yml @@ -2,7 +2,7 @@ version: 2 builds: - main: ./cmd/zrok binary: zrok - ldflags: "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}" + ldflags: "-s -w -X github.com/openziti/zrok/v2/build.Version={{.Tag}} -X github.com/openziti/zrok/v2/build.Hash={{.ShortCommit}}" env: - CGO_ENABLED=1 - CC=/usr/bin/x86_64-w64-mingw32-gcc diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md index 690eacb9..70dc6098 100644 --- a/ACKNOWLEDGEMENTS.md +++ b/ACKNOWLEDGEMENTS.md @@ -1,6 +1,6 @@ # ACKNOWLEDGEMENTS -## github.com/openziti/zrok/endpoints/socks +## github.com/openziti/zrok/v2/endpoints/socks Portions of the `socks` package is based on code from `https://github.com/tailscale/tailscale/blob/v1.58.2/net/socks5/socks5.go`, which included the following license: @@ -33,7 +33,7 @@ Portions of the `socks` package is based on code from `https://github.com/tailsc > OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -## github.com/openziti/zrok/drives/davServer +## github.com/openziti/zrok/v2/drives/davServer The `davServer` package is based on code from `https://cs.opensource.google/go/go/`, which included the following license: @@ -65,7 +65,7 @@ The `davServer` package is based on code from `https://cs.opensource.google/go/g > (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE -## github.com/openziti/zrok/drives/davClient +## github.com/openziti/zrok/v2/drives/davClient The `davClient` package is based on code from `github.com/emersion/go-webdav`, which included the following license: diff --git a/agent/agentGrpc/agent.pb.go b/agent/agentGrpc/agent.pb.go index 28806c08..16e4d0dd 100644 --- a/agent/agentGrpc/agent.pb.go +++ b/agent/agentGrpc/agent.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.9 -// protoc v6.31.1 +// protoc-gen-go v1.36.10 +// protoc v6.33.2 // source: agent/agentGrpc/agent.proto package agentGrpc @@ -1317,7 +1317,7 @@ const file_agent_agentGrpc_agent_proto_rawDesc = "" + "\fSharePrivate\x12\x14.SharePrivateRequest\x1a\x15.SharePrivateResponse\"\x1e\x82\xd3\xe4\x93\x02\x18\"\x16/v1/agent/sharePrivate\x12W\n" + "\vSharePublic\x12\x13.SharePublicRequest\x1a\x14.SharePublicResponse\"\x1d\x82\xd3\xe4\x93\x02\x17\"\x15/v1/agent/sharePublic\x12C\n" + "\x06Status\x12\x0e.StatusRequest\x1a\x0f.StatusResponse\"\x18\x82\xd3\xe4\x93\x02\x12\x12\x10/v1/agent/status\x12G\n" + - "\aVersion\x12\x0f.VersionRequest\x1a\x10.VersionResponse\"\x19\x82\xd3\xe4\x93\x02\x13\x12\x11/v1/agent/versionB*Z(github.com/openziti/zrok/agent/agentGrpcb\x06proto3" + "\aVersion\x12\x0f.VersionRequest\x1a\x10.VersionResponse\"\x19\x82\xd3\xe4\x93\x02\x13\x12\x11/v1/agent/versionB-Z+github.com/openziti/zrok/v2/agent/agentGrpcb\x06proto3" var ( file_agent_agentGrpc_agent_proto_rawDescOnce sync.Once diff --git a/agent/agentGrpc/agent_grpc.pb.go b/agent/agentGrpc/agent_grpc.pb.go index 85fcb2af..51b00cf0 100644 --- a/agent/agentGrpc/agent_grpc.pb.go +++ b/agent/agentGrpc/agent_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.5.1 -// - protoc v6.31.1 +// - protoc v6.33.2 // source: agent/agentGrpc/agent.proto package agentGrpc diff --git a/controller/dynamicProxyController/dynamicProxyController.pb.go b/controller/dynamicProxyController/dynamicProxyController.pb.go index d3856fa0..485ca550 100644 --- a/controller/dynamicProxyController/dynamicProxyController.pb.go +++ b/controller/dynamicProxyController/dynamicProxyController.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.9 -// protoc v6.31.1 +// protoc-gen-go v1.36.10 +// protoc v6.33.2 // source: controller/dynamicProxyController/dynamicProxyController.proto package dynamicProxyController @@ -203,7 +203,7 @@ const file_controller_dynamicProxyController_dynamicProxyController_proto_rawDes "shareToken\x18\x03 \x01(\tR\n" + "shareToken2a\n" + "\x16DynamicProxyController\x12G\n" + - "\x10FrontendMappings\x12\x18.FrontendMappingsRequest\x1a\x19.FrontendMappingsResponseB