Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

all: Bump Golang minor versions in accordance with latest release. #3693

Merged
merged 5 commits into from
Jun 16, 2021
Merged

all: Bump Golang minor versions in accordance with latest release. #3693

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf3c5e9
Bump minor Golang version in CI in accordance w/ latest release
Shaptic Jun 15, 2021
bf52ab2
Bump minor version to 1.16.5 in Dockerfiles
Shaptic Jun 15, 2021
1989a62
Pin golang to major versions so it's always the latest minor
Shaptic Jun 16, 2021
646b7a7
Pin golang to major versions so it's always the latest minor
Shaptic Jun 16, 2021
fe0703b
Update another Dockerfile to 1.16.
Shaptic Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
check_code_1_16:
working_directory: /go/src/github.com/stellar/go
docker:
- image: golang:1.16
- image: golang:1.16.5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should replace it with:

Suggested change
- image: golang:1.16.5
- image: golang:1.16

so that it will always pull latest Golang 1.16.x. This was recommended by @jacekn and @satyamz in the issue about bumping Golang versions in SDF. Same thing for 1.15.x.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this idea. We basically always want to be on latest patch release. Let's do it.

For minor versions let's stick to manual update for now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, I didn't realize 1.16 would always be the latest

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

steps:
- install_go_deps
- check_go_deps
Expand All @@ -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.13
environment:
GO111MODULE: "on"
PGHOST: localhost
Expand All @@ -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.13
environment:
GO111MODULE: "on"
PGHOST: localhost
Expand All @@ -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.5
environment:
GO111MODULE: "on"
PGHOST: localhost
Expand All @@ -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.5
environment:
GO111MODULE: "on"
PGHOST: localhost
Expand All @@ -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.5
steps:
- check_deprecations
- install_go_deps
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
go: [1.16.4]
bartekn marked this conversation as resolved.
Show resolved Hide resolved
go: [1.16.5]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand All @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion exp/services/recoverysigner/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.3 as build
FROM golang:1.16.5 as build

ADD . /src/recoverysigner
WORKDIR /src/recoverysigner
Expand Down
2 changes: 1 addition & 1 deletion exp/services/webauth/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.3 as build
FROM golang:1.16.5 as build

ADD . /src/webauth
WORKDIR /src/webauth
Expand Down
2 changes: 1 addition & 1 deletion exp/tools/dump-ledger-state/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./
Expand Down
2 changes: 1 addition & 1 deletion services/friendbot/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.3 as build
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we remove the patch version from some locations like this one, but we kept the patch versions in other services?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you talking about these? #3693 (comment)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That link doesn't seem to go anywhere for me. In the CI files patch versions are used, and in the Ticker, Keystore, and other docker files a patch version is used. It'd be helpful if we are consistent.

Copy link
Contributor Author

@Shaptic Shaptic Jun 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using the patch version means updating the patch version.
Using the minor version for Docker images means we always get the latest patch version (see above).
We can't do this for things like download URLs (see above), however, so we still need the patch version sometimes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. What's the motivation for only making that change for Friendbot and Horizon, and not the other services?

FROM golang:1.16.5 as build

ADD . /src/friendbot
WORKDIR /src/friendbot
Expand Down
2 changes: 1 addition & 1 deletion services/horizon/docker/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.3 AS builder
FROM golang:1.16.5 AS builder
Shaptic marked this conversation as resolved.
Show resolved Hide resolved

WORKDIR /go/src/github.com/stellar/go
COPY go.mod go.sum ./
Expand Down
4 changes: 2 additions & 2 deletions services/horizon/docker/verify-range/dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/horizon/internal/scripts/check_release_hash/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/keystore/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.3 as build
FROM golang:1.16.5 as build

ADD . /src/keystore
WORKDIR /src/keystore
Expand Down
2 changes: 1 addition & 1 deletion services/regulated-assets-approval-server/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/ticker/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.3 as build
FROM golang:1.16.5 as build

ADD . /src/ticker
WORKDIR /src/ticker
Expand Down
2 changes: 1 addition & 1 deletion services/ticker/docker/Dockerfile-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.3-stretch as build
FROM golang:1.16.5-stretch as build

LABEL maintainer="Alex Cordeiro <[email protected]>"

Expand Down