From 2e2f94edeaf95640f4a2317d70235eb66f5b898a Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Wed, 29 Jan 2020 16:16:42 -0700 Subject: [PATCH] Release 2.1.4 Signed-off-by: Ivan Kozlovic --- .travis.yml | 4 ++-- README.md | 4 ++-- docker/Dockerfile.alpine | 2 +- server/const.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index bcbbd4c896b..db2c8aa05ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ script: - set -e - go test -i ./... - go test -v -run=TestNoRace --failfast -p=1 ./... -- if [[ "$TRAVIS_GO_VERSION" =~ 1.12 ]]; then ./scripts/cov.sh TRAVIS; else go test -v -race -p=1 --failfast ./...; fi +- if [[ "$TRAVIS_GO_VERSION" =~ 1.13 ]]; then ./scripts/cov.sh TRAVIS; else go test -v -race -p=1 --failfast ./...; fi - set +e deploy: @@ -36,4 +36,4 @@ deploy: verbose: true on: tags: true - condition: $TRAVIS_GO_VERSION =~ 1.12 + condition: $TRAVIS_GO_VERSION =~ 1.13 diff --git a/README.md b/README.md index b76a5463197..06eb7fb7214 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ If you are interested in contributing to NATS, read about our... [Fossa-Image]: https://app.fossa.io/api/projects/git%2Bgithub.com%2Fnats-io%2Fgnatsd.svg?type=shield [Build-Status-Url]: https://travis-ci.org/nats-io/nats-server [Build-Status-Image]: https://travis-ci.org/nats-io/nats-server.svg?branch=master -[Release-Url]: https://github.com/nats-io/nats-server/releases/tag/v2.1.2 -[Release-image]: https://img.shields.io/badge/release-v2.1.2-1eb0fc.svg +[Release-Url]: https://github.com/nats-io/nats-server/releases/tag/v2.1.4 +[Release-image]: https://img.shields.io/badge/release-v2.1.4-1eb0fc.svg [Coverage-Url]: https://coveralls.io/r/nats-io/nats-server?branch=master [Coverage-image]: https://coveralls.io/repos/github/nats-io/nats-server/badge.svg?branch=master [ReportCard-Url]: https://goreportcard.com/report/nats-io/nats-server diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index e22fb3cd940..660c1e0298d 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM golang:1.12-alpine3.10 AS builder +FROM golang:1.13.7-alpine3.11 AS builder WORKDIR $GOPATH/src/github.com/nats-io/nats-server diff --git a/server/const.go b/server/const.go index a4262297319..1681f1d7640 100644 --- a/server/const.go +++ b/server/const.go @@ -40,7 +40,7 @@ var ( const ( // VERSION is the current version for the server. - VERSION = "2.1.3-RC05" + VERSION = "2.1.4" // PROTO is the currently supported protocol. // 0 was the original