starred/zrok
1
0
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2026-08-24 10:14:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

build and release machinery changes for -> github.com/openziti/zrok/v2 (#1124)

Browse Source
This commit is contained in:
Michael Quigley
2025-12-19 13:29:52 -05:00
parent e7f093447a
commit f1508e6fb9
14 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci-build.yml
+1 -1
View File
@@ -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
.goreleaser-darwin.yml
+2 -2
View File
@@ -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:
.goreleaser-linux-amd64.yml
+1 -1
View File
@@ -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:
.goreleaser-linux-arm64.yml
+1 -1
View File
@@ -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
.goreleaser-linux-armel.yml
+1 -1
View File
@@ -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
.goreleaser-linux-armhf.yml
+1 -1
View File
@@ -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
.goreleaser-windows.yml
+1 -1
View File
@@ -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
ACKNOWLEDGEMENTS.md
+3 -3
View File
@@ -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:
agent/agentGrpc/agent.pb.go
+3 -3
View File
@@ -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
agent/agentGrpc/agent_grpc.pb.go
+1 -1
View File
@@ -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
controller/dynamicProxyController/dynamicProxyController.pb.go
+3 -3
View File
@@ -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<Z:github.com/openziti/zrok/controller/dynamicProxyControllerb\x06proto3"
"\x10FrontendMappings\x12\x18.FrontendMappingsRequest\x1a\x19.FrontendMappingsResponseB?Z=github.com/openziti/zrok/v2/controller/dynamicProxyControllerb\x06proto3"
var (
file_controller_dynamicProxyController_dynamicProxyController_proto_rawDescOnce sync.Once
controller/dynamicProxyController/dynamicProxyController_grpc.pb.go
+1 -1
View File
@@ -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: controller/dynamicProxyController/dynamicProxyController.proto
package dynamicProxyController
docker/images/cross-build/linux-build.sh
+1 -1
View File
@@ -58,7 +58,7 @@ else
fi
for ARCH in "${JOBS[@]}"; do
LDFLAGS="-s -w -X 'github.com/openziti/zrok/build.Version=${VERSION}' -X 'github.com/openziti/zrok/build.Hash=${HASH}'"
LDFLAGS="-s -w -X 'github.com/openziti/zrok/v2/build.Version=${VERSION}' -X 'github.com/openziti/zrok/v2/build.Hash=${HASH}'"
GOOS=linux GOARCH=$(resolveArch "${ARCH}") \
go build -o "./dist/$(resolveArch "${ARCH}")/linux/zrok" \
-ldflags "${LDFLAGS}" \
sdk/golang/pubsub/README.md
+4 -4
View File
@@ -23,7 +23,7 @@ package main
import (
"context"
"fmt"
"github.com/openziti/zrok/sdk/golang/pubsub"
"github.com/openziti/zrok/v2/sdk/golang/pubsub"
"github.com/sirupsen/logrus"
)
@@ -67,7 +67,7 @@ import (
"context"
"fmt"
"time"
"github.com/openziti/zrok/sdk/golang/pubsub"
"github.com/openziti/zrok/v2/sdk/golang/pubsub"
"github.com/sirupsen/logrus"
)
@@ -159,7 +159,7 @@ package main
import (
"context"
"time"
"github.com/openziti/zrok/sdk/golang/pubsub"
"github.com/openziti/zrok/v2/sdk/golang/pubsub"
"github.com/sirupsen/logrus"
)
@@ -214,7 +214,7 @@ package main
import (
"context"
"time"
"github.com/openziti/zrok/sdk/golang/pubsub"
"github.com/openziti/zrok/v2/sdk/golang/pubsub"
"github.com/sirupsen/logrus"
)