Skip to content

Commit

Permalink
Merge pull request nats-io#1267 from nats-io/release_2_1_4
Browse files Browse the repository at this point in the history
Release 2.1.4
  • Loading branch information
kozlovic authored Jan 30, 2020
2 parents 4798567 + 2e2f94e commit fb009af
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -36,4 +36,4 @@ deploy:
verbose: true
on:
tags: true
condition: $TRAVIS_GO_VERSION =~ 1.12
condition: $TRAVIS_GO_VERSION =~ 1.13
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion server/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fb009af

Please sign in to comment.