From 59eef192cdadc8813778f8862b1fa928549e1fdd Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Thu, 13 Jan 2022 14:22:17 -0700 Subject: [PATCH] Prepare for release v2.7.0, start with v2.7.0-rc1 Since we have never released with goreleaser and GO111MODULE=on and have removed vendor directory, we are going to push a v2.7.0-rc1 tag. If the goreleaser process works fine and submit the draft release correctly, we will not do an actual v2.7.0-rc1 release. Instead, we will follow up immediately with the v2.7.0 tag and the proper release. Signed-off-by: Ivan Kozlovic --- .github/workflows/go-test.yaml | 4 ++-- .github/workflows/nightly.yaml | 2 +- .goreleaser-nightly.yml | 2 +- .goreleaser.yml | 2 +- .travis.yml | 12 ++++++------ scripts/cov.sh | 2 +- server/const.go | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/go-test.yaml b/.github/workflows/go-test.yaml index 6880dc8f..bac6c719 100644 --- a/.github/workflows/go-test.yaml +++ b/.github/workflows/go-test.yaml @@ -9,7 +9,7 @@ jobs: env: GOPATH: /home/runner/work/nats-server - GO111MODULE: "off" + GO111MODULE: "on" runs-on: ubuntu-latest steps: @@ -36,7 +36,7 @@ jobs: go build $(exit $(go fmt $GO_LIST | wc -l)) go vet $GO_LIST - find . -type f -name "*.go" | grep -v "/vendor/" | xargs $GOPATH/bin/misspell -error -locale US + find . -type f -name "*.go" | xargs $GOPATH/bin/misspell -error -locale US $GOPATH/bin/staticcheck $GO_LIST - name: Run tests diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index de8c3a92..19fa462a 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -12,7 +12,7 @@ jobs: env: GOPATH: /home/runner/work/nats-server - GO111MODULE: "off" + GO111MODULE: "on" steps: - name: Checkout code diff --git a/.goreleaser-nightly.yml b/.goreleaser-nightly.yml index f45b6b10..164058e4 100644 --- a/.goreleaser-nightly.yml +++ b/.goreleaser-nightly.yml @@ -7,7 +7,7 @@ builds: ldflags: - -w -X github.com/nats-io/nats-server/server.gitCommit={{.ShortCommit}} env: - - GO111MODULE=off + - GO111MODULE=on - CGO_ENABLED=0 goos: - linux diff --git a/.goreleaser.yml b/.goreleaser.yml index 3d60ec33..ed7b06da 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -16,7 +16,7 @@ builds: ldflags: - -w -X github.com/nats-io/nats-server/server.gitCommit={{.ShortCommit}} env: - - GO111MODULE=off + - GO111MODULE=on - CGO_ENABLED=0 goos: - darwin diff --git a/.travis.yml b/.travis.yml index e7553eb9..802ca0f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,17 +14,17 @@ addons: packages: - rpm env: -- GO111MODULE=off +- GO111MODULE=on go_import_path: github.com/nats-io/nats-server install: -- GO111MODULE=on go install honnef.co/go/tools/cmd/staticcheck@latest -- GO111MODULE=on go install github.com/client9/misspell/cmd/misspell@latest +- go install honnef.co/go/tools/cmd/staticcheck@latest +- go install github.com/client9/misspell/cmd/misspell@latest before_script: - GO_LIST=$(go list ./...) - go build - $(exit $(go fmt $GO_LIST | wc -l)) - go vet $GO_LIST -- find . -type f -name "*.go" | grep -v "/vendor/" | xargs misspell -error -locale US +- find . -type f -name "*.go" | xargs misspell -error -locale US - staticcheck $GO_LIST script: - set -e @@ -38,7 +38,7 @@ after_success: deploy: provider: script cleanup: true - script: curl -sL http://git.io/goreleaser | VERSION=v0.160.0 bash + script: curl -sL http://git.io/goreleaser on: tags: true - condition: $TRAVIS_GO_VERSION =~ 1.16 + condition: $TRAVIS_GO_VERSION =~ 1.17 diff --git a/scripts/cov.sh b/scripts/cov.sh index 48451972..393c5c84 100755 --- a/scripts/cov.sh +++ b/scripts/cov.sh @@ -1,7 +1,7 @@ #!/bin/bash -e # Run from directory above via ./scripts/cov.sh -export GO111MODULE="off" +export GO111MODULE="on" go get github.com/mattn/goveralls go get github.com/wadey/gocovmerge diff --git a/server/const.go b/server/const.go index b668f032..e8b41c39 100644 --- a/server/const.go +++ b/server/const.go @@ -41,7 +41,7 @@ var ( const ( // VERSION is the current version for the server. - VERSION = "2.7.0-beta" + VERSION = "2.7.0-rc1" // PROTO is the currently supported protocol. // 0 was the original