update

stellar · Oct 17, 2023 · 0419b5c · 0419b5c
1 parent 0dbe833
commit 0419b5c
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04]
-        go: ["1.20"]
+        go: ["1.21"]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04]
-        go: ["1.19", "1.20"]
+        go: ["1.20", "1.21"]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -56,7 +56,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04]
-        go: ["1.19", "1.20"]
+        go: ["1.20", "1.21"]
         pg: [9.6.5, 10]
     runs-on: ${{ matrix.os }}
     services:

diff --git 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.20"
+          go-version: "1.21"
 
       - name: Check dependencies
         run: ./gomod.sh

diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, ubuntu-22.04]
-        go: ["1.19", "1.20"]
+        go: ["1.20", "1.21"]
         pg: [9.6.5]
         ingestion-backend: [db, captive-core, captive-core-remote-storage]
         protocol-version: [19, 20]

diff --git a/exp/services/recoverysigner/docker/Dockerfile b/exp/services/recoverysigner/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20-bullseye as build
+FROM golang:1.21-bullseye as build
 
 ADD . /src/recoverysigner
 WORKDIR /src/recoverysigner

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/stellar/go
 
-go 1.21
+go 1.20
 
 require (
 	firebase.google.com/go v3.12.0+incompatible

diff --git a/services/friendbot/docker/Dockerfile b/services/friendbot/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20-bullseye as build
+FROM golang:1.21-bullseye as build
 
 ADD . /src/friendbot
 WORKDIR /src/friendbot

diff --git a/services/horizon/Makefile b/services/horizon/Makefile
@@ -11,7 +11,7 @@ binary-build:
 		--pull always \
 		--env CGO_ENABLED=0 \
 		--env GOFLAGS="-ldflags=-X=github.com/stellar/go/support/app.version=$(VERSION_STRING)" \
-		golang:1.20-bullseye \
+		golang:1.21-bullseye \
 		/bin/bash -c '\
 			git config --global --add safe.directory /go/src/github.com/stellar/go && \
 			cd /go/src/github.com/stellar/go && \

diff --git a/services/horizon/docker/Dockerfile.dev b/services/horizon/docker/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM golang:1.20-bullseye AS builder
+FROM golang:1.21-bullseye AS builder
 
 ARG VERSION="devel"
 WORKDIR /go/src/github.com/stellar/go
@@ -25,4 +25,4 @@ RUN apt-get clean
 COPY --from=builder /go/bin/horizon ./
 
 ENTRYPOINT ["./horizon"]
-    
+
diff --git 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.20-bullseye
+ARG GO_IMAGE=golang:1.21-bullseye
 FROM $GO_IMAGE
 
 WORKDIR /go/src/github.com/stellar/go