From daa1b8ad83129515a5cc33553f00d7a36ac026e1 Mon Sep 17 00:00:00 2001 From: Jason Brill Date: Mon, 14 Oct 2024 13:43:05 -0400 Subject: [PATCH 1/2] build: upgrade go to v1.23.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 45e8422..eac2984 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.3-alpine as builder +FROM golang:1.23.1-alpine as builder # Force Go to use the cgo based DNS resolver. This is required to ensure DNS # queries required to connect to linked containers succeed. From 9c546979a14d3d101c981acba37e185be301126d Mon Sep 17 00:00:00 2001 From: Jason Brill Date: Mon, 14 Oct 2024 14:12:12 -0400 Subject: [PATCH 2/2] tools: upgrade go to v1.23.1 --- .github/workflows/main.yml | 7 +------ go.mod | 4 +--- tools/Dockerfile | 2 +- tools/go.mod | 4 +--- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 884657d..bb40b7b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,12 +19,7 @@ env: # If you change this value, please change it in the following files as well: # /Dockerfile - # - # Don't bump this until go 1.19 is out (which should include a fix for - # https://github.com/golang/go/issues/51799). There was a race condition - # introduced with go 1.16.10 that causes the unit tests to fail (could also - # happen in production). - GO_VERSION: 1.22.3 + GO_VERSION: 1.23.1 jobs: ######################## diff --git a/go.mod b/go.mod index 27149e4..4939f69 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/lightninglabs/aperture -go 1.22.6 - -toolchain go1.22.7 +go 1.23.1 require ( github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026 diff --git a/tools/Dockerfile b/tools/Dockerfile index 03a2768..63ecd3f 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.6-bookworm +FROM golang:1.23.1-bookworm RUN apt-get update && apt-get install -y git ENV GOCACHE=/tmp/build/.cache diff --git a/tools/go.mod b/tools/go.mod index 210eb8f..26cb0c8 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,8 +1,6 @@ module github.com/lightninglabs/aperture/tools -go 1.22 - -toolchain go1.22.3 +go 1.23.1 require ( github.com/golangci/golangci-lint v1.55.2