Update master to 1.7.0 and use bumpversion for makefile config instead of git tags

pull/3995/head
nathan haugo 2018-07-23 15:53:48 -07:00
parent 85f222b62e
commit 8c1862d8ae
5 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,6 @@
[bumpversion]
current_version = 1.6.0
files = README.md server/swagger.json
current_version = 1.7.0
files = README.md server/swagger.json Makefile
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<release>\d+)
serialize = {major}.{minor}.{release}

View File

@ -1,6 +1,6 @@
.PHONY: assets dep clean test gotest gotestrace jstest run run-dev run-hmr ctags
VERSION ?= $(shell git describe --always --tags)
VERSION = 1.7.0
COMMIT ?= $(shell git rev-parse --short=8 HEAD)
GOBINDATA := $(shell go list -f {{.Root}} github.com/kevinburke/go-bindata 2> /dev/null)
YARN := $(shell command -v yarn 2> /dev/null)

View File

@ -136,7 +136,7 @@ option.
## Versions
The most recent version of Chronograf is
[v1.6.0](https://www.influxdata.com/downloads/).
[v1.7.0](https://www.influxdata.com/downloads/).
Spotted a bug or have a feature request? Please open
[an issue](https://github.com/influxdata/chronograf/issues/new)!
@ -178,7 +178,7 @@ By default, chronograf runs on port `8888`.
To get started right away with Docker, you can pull down our latest release:
```sh
docker pull chronograf:1.6.0
docker pull chronograf:1.7.0
```
### From Source

View File

@ -3,7 +3,7 @@
"info": {
"title": "Chronograf",
"description": "API endpoints for Chronograf",
"version": "1.6.0"
"version": "1.7.0"
},
"schemes": ["http"],
"basePath": "/chronograf/v1",

View File

@ -1,6 +1,6 @@
{
"name": "chronograf-ui",
"version": "1.6.0",
"version": "1.7.0",
"private": false,
"license": "AGPL-3.0",
"description": "",