From f29eab3a6ded8d24026ddad1c3769644c68ed09c Mon Sep 17 00:00:00 2001 From: Bartek Nowotarski Date: Tue, 6 Sep 2022 18:34:50 +0100 Subject: [PATCH 1/2] all: Bump Go to 1.18.6 and 1.19.1 --- .github/workflows/go.yml | 6 +++--- .github/workflows/horizon-release.yml | 2 +- .github/workflows/horizon.yml | 2 +- .../horizon/internal/scripts/check_release_hash/Dockerfile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index fc2c231086..5c1731ee4c 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - go: [1.19] + go: [1.19.1] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -38,7 +38,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - go: [1.18, 1.19] + go: [1.18.6, 1.19.1] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -56,7 +56,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - go: [1.18, 1.19] + go: [1.18.6, 1.19.1] pg: [9.6.5, 10] runs-on: ${{ matrix.os }} services: diff --git a/.github/workflows/horizon-release.yml b/.github/workflows/horizon-release.yml index 745e0b34a4..a2c852b1d8 100644 --- a/.github/workflows/horizon-release.yml +++ b/.github/workflows/horizon-release.yml @@ -22,7 +22,7 @@ jobs: - uses: ./.github/actions/setup-go with: - go-version: 1.19 + go-version: 1.19.1 - name: Check dependencies run: ./gomod.sh diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml index 345d4553a6..d9f57c295c 100644 --- a/.github/workflows/horizon.yml +++ b/.github/workflows/horizon.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - go: [1.18, 1.19] + go: [1.18.6, 1.19.1] pg: [9.6.5] ingestion-backend: [db, captive-core, captive-core-remote-storage] protocol-version: [18, 19] diff --git a/services/horizon/internal/scripts/check_release_hash/Dockerfile b/services/horizon/internal/scripts/check_release_hash/Dockerfile index da22ab0e53..a323a4eb6d 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.19 +ARG GO_IMAGE=golang:1.19.1 FROM $GO_IMAGE WORKDIR /go/src/github.com/stellar/go From 4f4faaf16b2fd84b0fa721bd8a3f92aca42c0269 Mon Sep 17 00:00:00 2001 From: Bartek Nowotarski Date: Tue, 6 Sep 2022 18:46:57 +0100 Subject: [PATCH 2/2] Update all 1.18 --- exp/services/recoverysigner/docker/Dockerfile | 2 +- exp/services/webauth/docker/Dockerfile | 2 +- services/friendbot/docker/Dockerfile | 2 +- services/horizon/docker/Dockerfile.dev | 2 +- services/keystore/docker/Dockerfile | 2 +- services/regulated-assets-approval-server/docker/Dockerfile | 2 +- services/ticker/docker/Dockerfile | 2 +- services/ticker/docker/Dockerfile-dev | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/exp/services/recoverysigner/docker/Dockerfile b/exp/services/recoverysigner/docker/Dockerfile index fff4aef3d2..0be0a25577 100644 --- a/exp/services/recoverysigner/docker/Dockerfile +++ b/exp/services/recoverysigner/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18 as build +FROM golang:1.19.1 as build ADD . /src/recoverysigner WORKDIR /src/recoverysigner diff --git a/exp/services/webauth/docker/Dockerfile b/exp/services/webauth/docker/Dockerfile index 1c0b5ec308..2ede06d251 100644 --- a/exp/services/webauth/docker/Dockerfile +++ b/exp/services/webauth/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18 as build +FROM golang:1.19.1 as build ADD . /src/webauth WORKDIR /src/webauth diff --git a/services/friendbot/docker/Dockerfile b/services/friendbot/docker/Dockerfile index bd1e48363e..24c0ca3120 100644 --- a/services/friendbot/docker/Dockerfile +++ b/services/friendbot/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18 as build +FROM golang:1.19.1 as build ADD . /src/friendbot WORKDIR /src/friendbot diff --git a/services/horizon/docker/Dockerfile.dev b/services/horizon/docker/Dockerfile.dev index 357f08188c..6057961eb5 100644 --- a/services/horizon/docker/Dockerfile.dev +++ b/services/horizon/docker/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM golang:1.18 AS builder +FROM golang:1.19.1 AS builder WORKDIR /go/src/github.com/stellar/go COPY go.mod go.sum ./ diff --git a/services/keystore/docker/Dockerfile b/services/keystore/docker/Dockerfile index f348d3afdd..d44d714972 100644 --- a/services/keystore/docker/Dockerfile +++ b/services/keystore/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18 as build +FROM golang:1.19.1 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 849ebff828..c462091f16 100644 --- a/services/regulated-assets-approval-server/docker/Dockerfile +++ b/services/regulated-assets-approval-server/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18 as build +FROM golang:1.19.1 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 c93ee784c1..78ccf3beba 100644 --- a/services/ticker/docker/Dockerfile +++ b/services/ticker/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18 as build +FROM golang:1.19.1 as build ADD . /src/ticker WORKDIR /src/ticker diff --git a/services/ticker/docker/Dockerfile-dev b/services/ticker/docker/Dockerfile-dev index 7eb5963f44..3a60c44716 100644 --- a/services/ticker/docker/Dockerfile-dev +++ b/services/ticker/docker/Dockerfile-dev @@ -1,4 +1,4 @@ -FROM golang:1.18 as build +FROM golang:1.19.1 as build LABEL maintainer="Alex Cordeiro "