diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 09b65179f..985dd7e96 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,8 +38,8 @@ jobs: shell: bash run: | go install github.com/mitchellh/gox@latest - $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=darwin -arch=amd64 -output=$GOX_OUTPUT ./... - $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=darwin -arch=arm64 -output=$GOX_OUTPUT ./... + $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=darwin -arch=amd64 -output=$GOX_OUTPUT ./ziti/ + $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=darwin -arch=arm64 -output=$GOX_OUTPUT ./ziti/ - name: Upload artifacts uses: actions/upload-artifact@v4 @@ -71,7 +71,7 @@ jobs: shell: bash run: | go install github.com/mitchellh/gox@latest - $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=windows -arch=amd64 -output=$GOX_OUTPUT ./... + $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=windows -arch=amd64 -output=$GOX_OUTPUT ./ziti/ - name: Upload artifacts uses: actions/upload-artifact@v4 @@ -105,11 +105,11 @@ jobs: $(go env GOPATH)/bin/ziti-ci configure-git go install github.com/mitchellh/gox@latest $(go env GOPATH)/bin/ziti-ci -t go-build-flags - $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=linux -arch=amd64 -output=$GOX_OUTPUT ./... + $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=linux -arch=amd64 -output=$GOX_OUTPUT ./ziti/ CC=arm-linux-gnueabihf-gcc \ - $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=linux -arch=arm -output=$GOX_OUTPUT ./... + $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=linux -arch=arm -output=$GOX_OUTPUT ./ziti/ CC=aarch64-linux-gnu-gcc \ - $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=linux -arch=arm64 -output=$GOX_OUTPUT ./... + $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=linux -arch=arm64 -output=$GOX_OUTPUT ./ziti/ - name: Upload artifacts uses: actions/upload-artifact@v4 @@ -228,6 +228,10 @@ jobs: shell: bash run: | $(go env GOPATH)/bin/ziti-ci configure-git + $(go env GOPATH)/bin/ziti-ci publish-to-github -t --prerelease --archive-base "" --dry-run + mkdir tmp + tar xfzv ./release/ziti-linux-amd64-* -C ./tmp + $(go env GOPATH)/bin/ziti-ci verify-current-version -t $(./tmp/ziti version) $(go env GOPATH)/bin/ziti-ci publish-to-github -t --prerelease --archive-base "" # only ziti-ci computed version for release branches and {version}-{run_id} for non-release branches diff --git a/CHANGELOG.md b/CHANGELOG.md index 51753b458..23de00267 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Release 1.1.13 +# Release 1.1.14 ## What's New @@ -7,10 +7,17 @@ ## Component Updates and Bug Fixes * github.com/openziti/xweb/v2: [v2.1.2 -> v2.1.3](https://github.com/openziti/xweb/compare/v2.1.2...v2.1.3) + * [Issue #2454](https://github.com/openziti/ziti/issues/2454) - Fix release archive * [Issue #2429](https://github.com/openziti/ziti/issues/2429) - Controller configurations without default Edge API binding panics * github.com/openziti/ziti: [v1.1.12 -> v1.1.13](https://github.com/openziti/ziti/compare/v1.1.12...v1.1.13) * [Issue #2427](https://github.com/openziti/ziti/issues/2427) - Add low overhead xgress protocol for DTLS links * [Issue #2422](https://github.com/openziti/ziti/issues/2422) - Busy first hop links should backpressure to xgress senders + * support using "\*" in host.v1/host.v2 allowedAddresses + + +# Release 1.1.13 + +This release will not be promoted, as a test binary was unintentionally released in the release archives. # Release 1.1.12 diff --git a/tests/shaper/main.go b/tests/shaper/main.go index 378747b41..85198d49b 100644 --- a/tests/shaper/main.go +++ b/tests/shaper/main.go @@ -1,3 +1,5 @@ +//go:build all + package main import (