From 288cc142e48a25e1f2a5795366220c367709ba94 Mon Sep 17 00:00:00 2001 From: Joshua Sing Date: Thu, 29 Aug 2024 03:41:05 +1000 Subject: [PATCH] all: build with go1.23 (#217) --- .github/workflows/go.yml | 2 +- .github/workflows/localnet-test.yml | 3 +-- .github/workflows/node.yml | 2 +- .github/workflows/release.yml | 2 +- README.md | 2 +- cmd/tbcd/README.md | 2 +- docker/bfgd/Dockerfile | 2 +- docker/bssd/Dockerfile | 2 +- docker/popmd/Dockerfile | 2 +- e2e/monitor/README.md | 2 +- e2e/monitor/go.mod | 4 +++- e2e/optimism-stack.Dockerfile | 2 +- go.mod | 2 +- 13 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 71e57735..62dfcfed 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -25,7 +25,7 @@ jobs: runs-on: "ubuntu-latest" strategy: matrix: - go-version: [ "1.22.x" ] + go-version: [ "1.23.x" ] services: postgres: image: postgres:16.3-alpine3.20 diff --git a/.github/workflows/localnet-test.yml b/.github/workflows/localnet-test.yml index 8ad33964..a4f155ad 100644 --- a/.github/workflows/localnet-test.yml +++ b/.github/workflows/localnet-test.yml @@ -20,7 +20,7 @@ jobs: runs-on: "ubuntu-latest" strategy: matrix: - go-version: [ "1.22.x" ] + go-version: [ "1.23.x" ] steps: - name: "Checkout repository" uses: actions/checkout@v4 @@ -42,4 +42,3 @@ jobs: working-directory: ./e2e/monitor # XXX should this be a make command? run: go test -v ./... - diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index c79f11ee..676b1173 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -17,7 +17,7 @@ concurrency: cancel-in-progress: "${{ github.event_name == 'pull_request' }}" env: - GO_VERSION: "1.22.x" + GO_VERSION: "1.23.x" PNPM_VERSION: "9.4.x" jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a75d165d..ecf792de 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ concurrency: cancel-in-progress: true env: - GO_VERSION: "1.22.x" + GO_VERSION: "1.23.x" PNPM_VERSION: "9.4.x" GO_LDFLAGS: >- -X 'github.com/hemilabs/heminetwork/version.Brand=Hemi Labs' diff --git a/README.md b/README.md index f50e939b..78a7b79f 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Pre-built binaries are available on the [Releases Page](https://github.com/hemil - `git` - `make` -- [Go v1.22.2+](https://go.dev/dl/) +- [Go v1.23+](https://go.dev/dl/) ### Building with Makefile diff --git a/cmd/tbcd/README.md b/cmd/tbcd/README.md index 6b961aae..9beae292 100644 --- a/cmd/tbcd/README.md +++ b/cmd/tbcd/README.md @@ -25,7 +25,7 @@ endpoint.** ### 🏁 Prerequisites -Ensure Go v1.22.2 or newer is installed on your system. +Ensure Go v1.23 or newer is installed on your system. ### Using Makefile diff --git a/docker/bfgd/Dockerfile b/docker/bfgd/Dockerfile index d68a3de1..907e2e70 100644 --- a/docker/bfgd/Dockerfile +++ b/docker/bfgd/Dockerfile @@ -3,7 +3,7 @@ # which can be found in the LICENSE file. # Build stage -FROM golang:1.22.6-alpine3.20@sha256:1a478681b671001b7f029f94b5016aed984a23ad99c707f6a0ab6563860ae2f3 AS builder +FROM golang:1.23-alpine3.20@sha256:d0b31558e6b3e4cc59f6011d79905835108c919143ebecc58f35965bf79948f4 AS builder ARG GO_LDFLAGS diff --git a/docker/bssd/Dockerfile b/docker/bssd/Dockerfile index 510e86bc..13dbf60d 100644 --- a/docker/bssd/Dockerfile +++ b/docker/bssd/Dockerfile @@ -3,7 +3,7 @@ # which can be found in the LICENSE file. # Build stage -FROM golang:1.22.6-alpine3.20@sha256:1a478681b671001b7f029f94b5016aed984a23ad99c707f6a0ab6563860ae2f3 AS builder +FROM golang:1.23-alpine3.20@sha256:d0b31558e6b3e4cc59f6011d79905835108c919143ebecc58f35965bf79948f4 AS builder ARG GO_LDFLAGS diff --git a/docker/popmd/Dockerfile b/docker/popmd/Dockerfile index 5938c462..28a963c6 100644 --- a/docker/popmd/Dockerfile +++ b/docker/popmd/Dockerfile @@ -3,7 +3,7 @@ # which can be found in the LICENSE file. # Build stage -FROM golang:1.22.6-alpine3.20@sha256:1a478681b671001b7f029f94b5016aed984a23ad99c707f6a0ab6563860ae2f3 AS builder +FROM golang:1.23-alpine3.20@sha256:d0b31558e6b3e4cc59f6011d79905835108c919143ebecc58f35965bf79948f4 AS builder ARG GO_LDFLAGS diff --git a/e2e/monitor/README.md b/e2e/monitor/README.md index 45a9592a..48e19b0f 100644 --- a/e2e/monitor/README.md +++ b/e2e/monitor/README.md @@ -5,7 +5,7 @@ that we want to test against. ## Prerequisites -* Go 1.22+ +* Go 1.23+ * `docker` available in your cli ## Running diff --git a/e2e/monitor/go.mod b/e2e/monitor/go.mod index 199ccdef..eda59c89 100644 --- a/e2e/monitor/go.mod +++ b/e2e/monitor/go.mod @@ -1,6 +1,8 @@ module github.com/hemilabs/heminetwork/e2e/monitor -go 1.22.6 +go 1.22 + +toolchain go1.23.0 replace github.com/hemilabs/heminetwork => ../../ diff --git a/e2e/optimism-stack.Dockerfile b/e2e/optimism-stack.Dockerfile index b9c3e805..f6e1c33a 100644 --- a/e2e/optimism-stack.Dockerfile +++ b/e2e/optimism-stack.Dockerfile @@ -2,7 +2,7 @@ # Use of this source code is governed by the MIT License, # which can be found in the LICENSE file. -FROM golang:1.22.6-bookworm@sha256:39b7e6ebaca464d51989858871f792f2e186dce8ce0cbdba7e88e4444b244407 +FROM golang:1.22.6-bookworm@sha256:f020456572fc292e9627b3fb435c6de5dfb8020fbcef1fd7b65dd092c0ac56bb RUN apt-get update diff --git a/go.mod b/go.mod index e9c95107..f3f79938 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/hemilabs/heminetwork go 1.22 -toolchain go1.22.6 +toolchain go1.23.0 // Temporary replace until we upstream our ws_js patch. replace github.com/coder/websocket v1.8.12 => github.com/hemilabs/websocket v0.0.0-20240813101919-bf33653e9aa5