From b260d5dfe27900e1be062ec9a984f540e22ffef7 Mon Sep 17 00:00:00 2001 From: George MacRorie Date: Tue, 10 Jun 2025 16:17:53 +0100 Subject: [PATCH 1/4] feat: upgrade Go tooling from 1.22 to 1.24 --- .github/workflows/go.yml | 4 ++-- Dockerfile | 2 +- go.mod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 2861d3e..47a54e3 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -20,7 +20,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.24.x cache: true - name: Build @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-go@v5 name: Set up Go with: - go-version: 1.22.x + go-version: 1.24.x cache: false # managed by golangci-lint - uses: golangci/golangci-lint-action@v6 diff --git a/Dockerfile b/Dockerfile index 7373cb0..53f14f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # It does not include a sally configuration. # A /sally.yaml file is required for this to run. -FROM golang:1.22-alpine +FROM golang:1.24-alpine COPY . /build WORKDIR /build diff --git a/go.mod b/go.mod index de0d966..596f386 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.uber.org/sally -go 1.22 +go 1.24 require ( github.com/stretchr/testify v1.10.0 From 91774bb099bf837407352c8d391f6f9ab5f43ae9 Mon Sep 17 00:00:00 2001 From: George MacRorie Date: Tue, 10 Jun 2025 16:20:32 +0100 Subject: [PATCH 2/4] chore: upgrade golangci lint action to v8 --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 47a54e3..c0ff7a6 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -47,7 +47,7 @@ jobs: go-version: 1.24.x cache: false # managed by golangci-lint - - uses: golangci/golangci-lint-action@v6 + - uses: golangci/golangci-lint-action@v8 name: Install golangci-lint with: version: latest From b15c01b75889f107610e8c2cb113c4e1bbb45dce Mon Sep 17 00:00:00 2001 From: George MacRorie Date: Tue, 10 Jun 2025 16:27:33 +0100 Subject: [PATCH 3/4] fix(gh): pin golangci-lint to v1.64.8 --- .github/workflows/go.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index c0ff7a6..7284be0 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -47,10 +47,10 @@ jobs: go-version: 1.24.x cache: false # managed by golangci-lint - - uses: golangci/golangci-lint-action@v8 + - uses: golangci/golangci-lint-action@v6 name: Install golangci-lint with: - version: latest + version: v1.64.8 args: --help # make lint will run the linter - run: make lint From ce72bfa84199a6f7df3e65ba6be5b7b4ffc58fab Mon Sep 17 00:00:00 2001 From: George MacRorie Date: Tue, 10 Jun 2025 16:36:52 +0100 Subject: [PATCH 4/4] fix: golangci lint config niliness -> nilness --- .golangci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index f84e6da..1ab957d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -13,7 +13,7 @@ linters-settings: govet: # These govet checks are disabled by default, but they're useful. enable: - - niliness + - nilness - reflectvaluecompare - sortslice - unusedwrite