From aaec655f00b4ca8008d7d5d5f76e388d066cec95 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 16 Jun 2021 16:22:24 -0700 Subject: [PATCH] all: Bump Golang minor versions in accordance with latest release. (#3693) * Bump minor Golang version in CI in accordance w/ latest release (1.16.5, 1.15.13) * Also pin Docker `golang` images to the major version so this doesn't need to happen every time. Co-authored-by: Bartek Nowotarski --- .circleci/config.yml | 14 +++++++------- .github/workflows/go.yml | 6 +++--- exp/services/recoverysigner/docker/Dockerfile | 2 +- exp/services/webauth/docker/Dockerfile | 2 +- exp/tools/dump-ledger-state/Dockerfile | 2 +- services/friendbot/docker/Dockerfile | 2 +- services/horizon/docker/Dockerfile.dev | 2 +- services/horizon/docker/verify-range/dependencies | 4 ++-- .../internal/scripts/check_release_hash/Dockerfile | 2 +- services/keystore/docker/Dockerfile | 2 +- .../docker/Dockerfile | 2 +- services/ticker/docker/Dockerfile | 2 +- services/ticker/docker/Dockerfile-dev | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ea616bfac..84c889b8f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -115,8 +115,8 @@ commands: name: Download and install golang command: | sudo rm -rf /usr/local/go - wget https://dl.google.com/go/go1.16.3.linux-amd64.tar.gz - sudo tar -C /usr/local -xzf go1.16.3.linux-amd64.tar.gz + wget https://dl.google.com/go/go1.16.5.linux-amd64.tar.gz + sudo tar -C /usr/local -xzf go1.16.5.linux-amd64.tar.gz # install_go_deps installs the go dependencies of the project. install_go_deps: @@ -241,7 +241,7 @@ jobs: test_code_1_15: working_directory: /go/src/github.com/stellar/go docker: - - image: golang:1.15.11 + - image: golang:1.15 environment: GO111MODULE: "on" PGHOST: localhost @@ -261,7 +261,7 @@ jobs: test_code_1_15_postgres10: working_directory: /go/src/github.com/stellar/go docker: - - image: golang:1.15.11 + - image: golang:1.15 environment: GO111MODULE: "on" PGHOST: localhost @@ -282,7 +282,7 @@ jobs: test_code_1_16: working_directory: /go/src/github.com/stellar/go docker: - - image: golang:1.16.3 + - image: golang:1.16 environment: GO111MODULE: "on" PGHOST: localhost @@ -302,7 +302,7 @@ jobs: test_code_1_16_postgres10: working_directory: /go/src/github.com/stellar/go docker: - - image: golang:1.16.3 + - image: golang:1.16 environment: GO111MODULE: "on" PGHOST: localhost @@ -325,7 +325,7 @@ jobs: publish_artifacts: working_directory: /go/src/github.com/stellar/go docker: - - image: golang:1.16.3 + - image: golang:1.16 steps: - check_deprecations - install_go_deps diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index c2acf7e5d5..1564254d48 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - go: [1.16.4] + go: [1.16.5] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 @@ -29,7 +29,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - go: [1.16.4, 1.15.11] + go: [1.16.5, 1.15.13] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 @@ -43,7 +43,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - go: [1.16.4, 1.15.11] + go: [1.16.5, 1.15.13] pg: [9.6.5, 10] runs-on: ${{ matrix.os }} services: diff --git a/exp/services/recoverysigner/docker/Dockerfile b/exp/services/recoverysigner/docker/Dockerfile index 681202f75e..75ec36572b 100644 --- a/exp/services/recoverysigner/docker/Dockerfile +++ b/exp/services/recoverysigner/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.3 as build +FROM golang:1.16 as build ADD . /src/recoverysigner WORKDIR /src/recoverysigner diff --git a/exp/services/webauth/docker/Dockerfile b/exp/services/webauth/docker/Dockerfile index 20b0591ac1..835b95c691 100644 --- a/exp/services/webauth/docker/Dockerfile +++ b/exp/services/webauth/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.3 as build +FROM golang:1.16 as build ADD . /src/webauth WORKDIR /src/webauth diff --git a/exp/tools/dump-ledger-state/Dockerfile b/exp/tools/dump-ledger-state/Dockerfile index 57c95dbf39..50ea0e391b 100644 --- a/exp/tools/dump-ledger-state/Dockerfile +++ b/exp/tools/dump-ledger-state/Dockerfile @@ -21,7 +21,7 @@ RUN echo "host all all all trust" > /etc/postgresql/9.6/main/pg_hba.conf # And add `listen_addresses` to `/etc/postgresql/9.6/main/postgresql.conf` RUN echo "listen_addresses='*'" >> /etc/postgresql/9.6/main/postgresql.conf -RUN curl -sL https://storage.googleapis.com/golang/go1.16.3.linux-amd64.tar.gz | tar -C /usr/local -xz +RUN curl -sL https://storage.googleapis.com/golang/go1.16.5.linux-amd64.tar.gz | tar -C /usr/local -xz RUN ln -s /usr/local/go/bin/go /usr/local/bin/go WORKDIR /go/src/github.com/stellar/go COPY go.mod go.sum ./ diff --git a/services/friendbot/docker/Dockerfile b/services/friendbot/docker/Dockerfile index e02b0f4fbd..d02a7a1e25 100644 --- a/services/friendbot/docker/Dockerfile +++ b/services/friendbot/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.3 as build +FROM golang:1.16 as build ADD . /src/friendbot WORKDIR /src/friendbot diff --git a/services/horizon/docker/Dockerfile.dev b/services/horizon/docker/Dockerfile.dev index 7bc369f946..fe97bdd4ef 100644 --- a/services/horizon/docker/Dockerfile.dev +++ b/services/horizon/docker/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM golang:1.16.3 AS builder +FROM golang:1.16 AS builder WORKDIR /go/src/github.com/stellar/go COPY go.mod go.sum ./ diff --git a/services/horizon/docker/verify-range/dependencies b/services/horizon/docker/verify-range/dependencies index 2ac21baba5..2bd5784f5c 100644 --- a/services/horizon/docker/verify-range/dependencies +++ b/services/horizon/docker/verify-range/dependencies @@ -10,8 +10,8 @@ echo "deb https://apt.stellar.org $(lsb_release -cs) stable" | sudo tee -a /etc/ apt-get update apt-get install -y stellar-core=${STELLAR_CORE_VERSION} -wget https://dl.google.com/go/go1.16.3.linux-amd64.tar.gz -tar -C /usr/local -xzf go1.16.3.linux-amd64.tar.gz +wget https://dl.google.com/go/go1.16.5.linux-amd64.tar.gz +tar -C /usr/local -xzf go1.16.5.linux-amd64.tar.gz # configure postgres service postgresql start diff --git a/services/horizon/internal/scripts/check_release_hash/Dockerfile b/services/horizon/internal/scripts/check_release_hash/Dockerfile index 36a3d8cc2f..53c3a66be2 100644 --- a/services/horizon/internal/scripts/check_release_hash/Dockerfile +++ b/services/horizon/internal/scripts/check_release_hash/Dockerfile @@ -1,5 +1,5 @@ # Change to Go version used in CI or rebuild with --build-arg. -ARG GO_IMAGE=golang:1.16.3 +ARG GO_IMAGE=golang:1.16.5 FROM $GO_IMAGE WORKDIR /go/src/github.com/stellar/go diff --git a/services/keystore/docker/Dockerfile b/services/keystore/docker/Dockerfile index 45c9292957..a68041f148 100644 --- a/services/keystore/docker/Dockerfile +++ b/services/keystore/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.3 as build +FROM golang:1.16.5 as build ADD . /src/keystore WORKDIR /src/keystore diff --git a/services/regulated-assets-approval-server/docker/Dockerfile b/services/regulated-assets-approval-server/docker/Dockerfile index e29a355f7b..bf6bd2c9d2 100644 --- a/services/regulated-assets-approval-server/docker/Dockerfile +++ b/services/regulated-assets-approval-server/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.3 as build +FROM golang:1.16.5 as build ADD . /src/regulated-assets-approval-server WORKDIR /src/regulated-assets-approval-server diff --git a/services/ticker/docker/Dockerfile b/services/ticker/docker/Dockerfile index 327ce8578d..72960ac24a 100644 --- a/services/ticker/docker/Dockerfile +++ b/services/ticker/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.3 as build +FROM golang:1.16.5 as build ADD . /src/ticker WORKDIR /src/ticker diff --git a/services/ticker/docker/Dockerfile-dev b/services/ticker/docker/Dockerfile-dev index 8be2701822..4e7225c068 100644 --- a/services/ticker/docker/Dockerfile-dev +++ b/services/ticker/docker/Dockerfile-dev @@ -1,4 +1,4 @@ -FROM golang:1.16.3-stretch as build +FROM golang:1.16.5-stretch as build LABEL maintainer="Alex Cordeiro "