From 95f4ab84b72e33708baa9821fedeaeddf76a0cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Naveiras?= Date: Wed, 26 Feb 2020 18:30:57 +0000 Subject: [PATCH 1/5] Update golang:1.14.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl Naveiras --- .promu.yml | 2 +- Dockerfile.multi-stage | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.promu.yml b/.promu.yml index 7139c31d39..be5e09cbd5 100644 --- a/.promu.yml +++ b/.promu.yml @@ -1,5 +1,5 @@ go: - version: 1.13.6 + version: 1.14.2 repository: path: github.com/thanos-io/thanos build: diff --git a/Dockerfile.multi-stage b/Dockerfile.multi-stage index d8fb001158..031a2deea5 100644 --- a/Dockerfile.multi-stage +++ b/Dockerfile.multi-stage @@ -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 From 022d79f4d2ba65b2e515efbe62e597e0009a0464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Naveiras?= Date: Wed, 26 Feb 2020 18:32:46 +0000 Subject: [PATCH 2/5] Update thanos-ci:go1.14.2-node MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .circleci/config.yml | 2 +- Dockerfile.thanos-ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac2336fe09..649e021bdd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 diff --git a/Dockerfile.thanos-ci b/Dockerfile.thanos-ci index 4c12365193..4a96a3538d 100644 --- a/Dockerfile.thanos-ci +++ b/Dockerfile.thanos-ci @@ -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 From fb8da2b8cbd758925b494b9ce6562991d2513c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Naveiras?= Date: Wed, 26 Feb 2020 21:11:51 +0000 Subject: [PATCH 3/5] Update golang:1.14.2 for github actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl Naveiras --- .github/workflows/cross-build.yaml | 2 +- .github/workflows/e2e.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cross-build.yaml b/.github/workflows/cross-build.yaml index 832ffa8fad..853f8ddd26 100644 --- a/.github/workflows/cross-build.yaml +++ b/.github/workflows/cross-build.yaml @@ -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 diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 1cc20d0dc2..17934a5e9b 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -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 From f9d51e6c03cc785a23d255ed7cccce436a7a25b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Naveiras?= Date: Wed, 26 Feb 2020 21:55:24 +0000 Subject: [PATCH 4/5] Update CHANGELOG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl Naveiras --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0637b52db3..eb00c7444f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From f7c48633bf19f0a98df7e87a112da1ad9e2b14ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Naveiras?= Date: Fri, 24 Apr 2020 20:43:16 +0100 Subject: [PATCH 5/5] Fix yaml indentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl Naveiras --- .circleci/config.yml | 68 ++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 649e021bdd..0133c5d6b9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 @@ -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 @@ -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: /.*/