Skip to content

Commit

Permalink
Updated to golang v1.14.2 (#2194)
Browse files Browse the repository at this point in the history
* Update golang:1.14.2

Signed-off-by: Raúl Naveiras <me@raulnaveiras.com>

* Update thanos-ci:go1.14.2-node

It requires a manual process to generate and push this container.

```
make docker-ci DOCKER_CI_TAG=go1.14.2-node
```

Signed-off-by: Raúl Naveiras <me@raulnaveiras.com>

* Update golang:1.14.2 for github actions

Signed-off-by: Raúl Naveiras <me@raulnaveiras.com>

* Update CHANGELOG

Signed-off-by: Raúl Naveiras <me@raulnaveiras.com>

* Fix yaml indentation

Signed-off-by: Raúl Naveiras <me@raulnaveiras.com>
  • Loading branch information
rnaveiras committed May 4, 2020
1 parent 83f65af commit 3768eff
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 40 deletions.
70 changes: 35 additions & 35 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 2
defaults: &defaults
docker:
# Built by Thanos make docker-ci
- image: quay.io/thanos/thanos-ci:v0.3.0
- image: quay.io/thanos/thanos-ci:go1.14.2-node
jobs:
test:
<<: *defaults
Expand All @@ -21,7 +21,7 @@ jobs:
steps:
- checkout
- setup_remote_docker:
version: 17.07.0-ce
version: 17.07.0-ce
- run:
name: Create Secret if PR is not forked
# GCS integration tests are run only for author's PR that have write access, because these tests
Expand Down Expand Up @@ -53,12 +53,12 @@ jobs:
environment:
GOBIN: "/home/circleci/.go_workspace/go/bin"
steps:
- checkout
- run: make crossbuild
- persist_to_workspace:
root: .
paths:
- .build
- checkout
- run: make crossbuild
- persist_to_workspace:
root: .
paths:
- .build

publish_master:
<<: *defaults
Expand Down Expand Up @@ -106,30 +106,30 @@ workflows:
version: 2
thanos:
jobs:
- test:
filters:
tags:
only: /.*/
- publish_master:
requires:
- test
filters:
branches:
only: master
- cross_build:
requires:
- test
filters:
tags:
only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
branches:
ignore: /.*/
- publish_release:
requires:
- test
- cross_build
filters:
tags:
only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
branches:
ignore: /.*/
- test:
filters:
tags:
only: /.*/
- publish_master:
requires:
- test
filters:
branches:
only: master
- cross_build:
requires:
- test
filters:
tags:
only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
branches:
ignore: /.*/
- publish_release:
requires:
- test
- cross_build
filters:
tags:
only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
branches:
ignore: /.*/
2 changes: 1 addition & 1 deletion .github/workflows/cross-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Install Go.
uses: actions/setup-go@v1
with:
go-version: 1.13.6
go-version: 1.14.2

- name: Check out code into the Go module directory
uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install Go.
uses: actions/setup-go@v1
with:
go-version: 1.13.6
go-version: 1.14.2

- name: Check out code into the Go module directory.
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .promu.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
go:
version: 1.13.6
version: 1.14.2
repository:
path: github.com/thanos-io/thanos
build:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel

### Changed

- [#2194](https://github.com/thanos-io/thanos/pull/2194) Updated to golang v1.14.2
- [#2505](https://github.com/thanos.io/thanos/pull/2505) Store: remove obsolete `thanos_store_node_info` metric.
- [2513](https://github.com/thanos-io/thanos/pull/2513) Tools: Moved `thanos bucket` commands to `thanos tools bucket`, also
moved `thanos check rules` to `thanos tools rules-check`. `thanos tools rules-check` also takes rules by `--rules` repeated flag not argument
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.multi-stage
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.6-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder

WORKDIR $GOPATH/src/github.com/thanos-io/thanos
# Change in the docker context invalidates the cache so to leverage docker
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.thanos-ci
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Available from https://hub.docker.com/r/circleci/golang/
FROM circleci/golang:1.13.6
FROM circleci/golang:1.14.2-node

ENV GOBIN=/go/bin

Expand Down

0 comments on commit 3768eff

Please sign in to comment.