From c7fddf202db8b136076d043ff37d519edc7a6033 Mon Sep 17 00:00:00 2001 From: crapStone Date: Sat, 15 Feb 2025 19:08:08 +0000 Subject: [PATCH] chore: update golang (#431) ping #428 Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/431 Co-authored-by: crapStone Co-committed-by: crapStone --- .woodpecker/build.yml | 10 +++++----- .woodpecker/lint.yml | 2 +- Dockerfile | 2 +- flake.lock | 4 ++-- go.mod | 4 +--- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index 2b8b7eb..20e47eb 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -5,13 +5,13 @@ when: steps: # use vendor to cache dependencies vendor: - image: golang:1.23 + image: golang:1.24 commands: - go mod vendor build: depends_on: vendor - image: codeberg.org/6543/docker-images/golang_just:go-1.23 + image: codeberg.org/6543/docker-images/golang_just:go-1.24 commands: - go version - just build @@ -32,7 +32,7 @@ steps: build-tag: depends_on: vendor - image: codeberg.org/6543/docker-images/golang_just:go-1.23 + image: codeberg.org/6543/docker-images/golang_just:go-1.24 commands: - go version - just build-tag ${CI_COMMIT_TAG##v} @@ -41,7 +41,7 @@ steps: test: depends_on: build - image: codeberg.org/6543/docker-images/golang_just:go-1.23 + image: codeberg.org/6543/docker-images/golang_just:go-1.24 commands: - just test when: @@ -50,7 +50,7 @@ steps: integration-tests: failure: ignore depends_on: build - image: codeberg.org/6543/docker-images/golang_just:go-1.23 + image: codeberg.org/6543/docker-images/golang_just:go-1.24 commands: - just integration environment: diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml index f2dee1f..bdb6fb0 100644 --- a/.woodpecker/lint.yml +++ b/.woodpecker/lint.yml @@ -6,7 +6,7 @@ when: steps: lint: depends_on: [] - image: golangci/golangci-lint:v1.63.4 + image: golangci/golangci-lint:v1.64.5 commands: - go version - go install mvdan.cc/gofumpt@latest diff --git a/Dockerfile b/Dockerfile index 7cc21c5..dfec6d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Set the default Go version as a build argument -ARG XGO="go-1.23.x" +ARG XGO="go-1.24.x" # Use xgo (a Go cross-compiler tool) as build image FROM --platform=$BUILDPLATFORM techknowlogick/xgo:${XGO} AS build diff --git a/flake.lock b/flake.lock index b3837d9..ef63308 100644 --- a/flake.lock +++ b/flake.lock @@ -20,8 +20,8 @@ "nixpkgs": { "locked": { "lastModified": 0, - "narHash": "sha256-1/WZ7juTZp6oWAFb14WeANN2veJFGZ4AFSNRpk4Jiw8=", - "path": "/nix/store/prhs96gxbb9bcr4ia6ql2hsjga50mrdl-source", + "narHash": "sha256-WFZDy4bG2RkkCQloIEG8BXEvzyKklFVJbAismOJsIp4=", + "path": "/nix/store/c77dsgfxjywplw8bk8s8jlkdsr7a1bi9-source", "type": "path" }, "original": { diff --git a/go.mod b/go.mod index 5df680c..bff6b77 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module codeberg.org/codeberg/pages -go 1.23.0 - -toolchain go1.23.5 +go 1.24.0 require ( code.gitea.io/sdk/gitea v0.20.0