diff --git a/.goreleaser.yml b/.goreleaser.yml index f30fbe8c2..eada4ae74 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -54,3 +54,10 @@ release: name: velero draft: true prerelease: auto + +git: + # What should be used to sort tags when gathering the current and previous + # tags if there are more than one tag in the same commit. + # + # Default: `-version:refname` + tag_sort: -version:creatordate diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index 3dcb51b40..b12179aa4 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -50,7 +50,7 @@ RUN wget --quiet https://github.com/protocolbuffers/protobuf/releases/download/v RUN go install github.com/golang/protobuf/protoc-gen-go@v1.4.3 # get goreleaser -RUN wget --quiet https://github.com/goreleaser/goreleaser/releases/download/v1.12.3/goreleaser_Linux_x86_64.tar.gz && \ +RUN wget --quiet https://github.com/goreleaser/goreleaser/releases/download/v1.15.2/goreleaser_Linux_x86_64.tar.gz && \ tar xvf goreleaser_Linux_x86_64.tar.gz && \ mv goreleaser /usr/bin/goreleaser && \ chmod +x /usr/bin/goreleaser diff --git a/hack/release-tools/goreleaser.sh b/hack/release-tools/goreleaser.sh index 2aa4b1e9f..86235d1ec 100755 --- a/hack/release-tools/goreleaser.sh +++ b/hack/release-tools/goreleaser.sh @@ -48,12 +48,10 @@ if [[ "${PUBLISH:-}" != "TRUE" ]]; then goreleaser release \ --clean \ --release-notes="${RELEASE_NOTES_FILE}" \ - --skip-publish \ - --config goreleaser.yaml + --skip-publish else echo "Getting ready to publish" goreleaser release \ --clean \ --release-notes="${RELEASE_NOTES_FILE}" - --config goreleaser.yaml fi diff --git a/hack/release-tools/goreleaser.yaml b/hack/release-tools/goreleaser.yaml deleted file mode 100644 index 9bbe47335..000000000 --- a/hack/release-tools/goreleaser.yaml +++ /dev/null @@ -1,6 +0,0 @@ -git: - # What should be used to sort tags when gathering the current and previous - # tags if there are more than one tag in the same commit. - # - # Default: `-version:refname` - tag_sort: -version:creatordate \ No newline at end of file