From 7b52802c19090058c66d70bb93b2d72bcabaecac Mon Sep 17 00:00:00 2001 From: John McBride Date: Fri, 23 Oct 2026 10:10:27 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20chore:=20Updates=20for=20go=201.?= =?UTF-8?q?27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John McBride --- .github/workflows/go.yaml | 5 +++++ flake.lock | 18 +++++++++--------- flake.nix | 2 +- go/fixtures/go.mod | 2 +- go/main.go | 2 +- golangcilint/Makefile | 3 +++ golangcilint/main.go | 2 +- 7 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 golangcilint/Makefile diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index 3fefed8..77060f8 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -31,3 +31,8 @@ jobs: run: nix develop --command make -C go test env: DAGGER_CLOUD_TOKEN: ${{ secrets.DAGGER_CLOUD_TOKEN }} + + - name: Test golangci-lint module + run: nix develop --command make -C golangcilint test + env: + DAGGER_CLOUD_TOKEN: ${{ secrets.DAGGER_CLOUD_TOKEN }} diff --git a/flake.lock b/flake.lock index b2336d5..8c07c2c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1785344846, - "narHash": "sha256-E0v8IiF9sEWNw615Yae1RH8KtMuOOF+mcafu2m0kHyE=", + "lastModified": 1792623028, + "narHash": "sha256-UTNLBdOxJsE4IwumT+ZYkb60umN/IbSHSizYgoJwDjQ=", "owner": "dagger", "repo": "nix", - "rev": "b35b2b5ab62ace3a3c1e779c497de1ad762a4aa1", + "rev": "8b9a96f1d7cd8afefb8c13c4f4a092aa5b58c7c1", "type": "github" }, "original": { @@ -25,11 +25,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1791914995, + "narHash": "sha256-Zf/xfQEAasnwnmEfHqW/4hjDE/s44yn2hD4RuVIZRjA=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b7a79d3fea1e214f6d668d521cecec0c01e26544", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779414690, - "narHash": "sha256-gOTcX/9MZVMUE0Xvb4IEcv+0TQJkZFNEnL757ljU360=", + "lastModified": 1792506237, + "narHash": "sha256-Q/8KLB6jNfpaUN1HAedE/u/Et9feE/zYSsutBLKrCFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6dedf69f94d03cbe7bdde106f2d4c23ae2a853bf", + "rev": "5adc50831c259f87faeb09ddf930d43597197473", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 547be45..09766a0 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ { devShells.default = pkgs.mkShell { buildInputs = [ - pkgs.go_1_25 + pkgs.go_1_27 pkgs.gh pkgs.gotools pkgs.gnumake diff --git a/go/fixtures/go.mod b/go/fixtures/go.mod index 360e099..50a0545 100644 --- a/go/fixtures/go.mod +++ b/go/fixtures/go.mod @@ -1,3 +1,3 @@ module example.com/fixture -go 1.26 +go 1.27 diff --git a/go/main.go b/go/main.go index 510e2a5..6b8debb 100644 --- a/go/main.go +++ b/go/main.go @@ -37,7 +37,7 @@ func New( func (g *Go) goContainer() (*dagger.Container, error) { ctr := dag.Container(). - From("golang:1.26-bookworm"). + From("golang:1.27-bookworm"). WithMountedCache("/go/pkg/mod", dag.CacheVolume("go-mod")). WithMountedCache("/root/.cache/go-build", dag.CacheVolume("go-build")). WithWorkdir("/src"). diff --git a/golangcilint/Makefile b/golangcilint/Makefile new file mode 100644 index 0000000..73613be --- /dev/null +++ b/golangcilint/Makefile @@ -0,0 +1,3 @@ +.PHONY: test +test: + dagger call --source=../go/fixtures check diff --git a/golangcilint/main.go b/golangcilint/main.go index cb76ea5..0a1eeb6 100644 --- a/golangcilint/main.go +++ b/golangcilint/main.go @@ -10,7 +10,7 @@ import ( ) const ( - golangciLintImage string = "golangci/golangci-lint:v2.11" + golangciLintImage string = "golangci/golangci-lint:v2.15.0" ) //go:embed .golangci.yml