feat: upgrade Go toolchain to 1.25.8 (#5328)

2026-03-25 11:51:27 -05:00
parent 9038d8ab5b
commit 6f18f67138
5 changed files with 62 additions and 70 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,8 @@
 name: Build

+env:
+  GO_VERSION: "1.25.8"
+
 on:
  push:
    branches:
@@ -7,7 +10,6 @@ on:
  pull_request:

 jobs:
-
  go-tests:
    name: Running Go tests
    runs-on: ubuntu-latest
@@ -24,7 +26,7 @@ jobs:
      - uses: actions/checkout@v3
      - uses: actions/setup-go@v4
        with:
-          go-version: '1.23'
+          go-version: ${{ env.GO_VERSION }}
          cache-dependency-path: ./go.mod
      - name: Tests
        run: |
@@ -34,13 +36,13 @@ jobs:
  frontend:
    name: Front-end
    runs-on: ubuntu-latest
-    needs: [ go-tests ]
+    needs: [go-tests]
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-node@v3
        with:
          node-version: 20
-          cache: 'yarn'
+          cache: "yarn"
          cache-dependency-path: ./web/yarn.lock
      - run: yarn install && CI=false yarn run build
        working-directory: ./web
@@ -54,12 +56,12 @@ jobs:
  backend:
    name: Back-end
    runs-on: ubuntu-latest
-    needs: [ go-tests ]
+    needs: [go-tests]
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-go@v4
        with:
-          go-version: '1.23'
+          go-version: ${{ env.GO_VERSION }}
          cache-dependency-path: ./go.mod
      - run: go version
      - name: Build
@@ -70,27 +72,28 @@ jobs:
  linter:
    name: Go-Linter
    runs-on: ubuntu-latest
-    needs: [ go-tests ]
+    needs: [go-tests]
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-go@v4
        with:
-          go-version: '1.23'
+          go-version: ${{ env.GO_VERSION }}
          cache: false

-      # gen a dummy config file
-      - run: touch dummy.yml
+      - name: Sync vendor tree
+        run: go mod vendor

+      # CI and local `make lint` both use the repo's gofumpt-only golangci-lint config.
      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v9.2.0
        with:
-          version: latest
-          args: --disable-all -c dummy.yml -E=gofumpt --max-same-issues=0 --timeout 5m --modules-download-mode=mod
+          version: v2.11.4
+          args: --config .golangci.yml ./...

  e2e:
    name: e2e-test
    runs-on: ubuntu-latest
-    needs: [ go-tests ]
+    needs: [go-tests]
    services:
      mysql:
        image: mysql:5.7
@@ -104,7 +107,7 @@ jobs:
      - uses: actions/checkout@v3
      - uses: actions/setup-go@v4
        with:
-          go-version: '1.23'
+          go-version: ${{ env.GO_VERSION }}
          cache-dependency-path: ./go.mod
      - name: start backend
        run: nohup go run ./main.go > /tmp/backend.log 2>&1 &
@@ -129,7 +132,7 @@ jobs:
      - uses: actions/setup-node@v3
        with:
          node-version: 20
-          cache: 'yarn'
+          cache: "yarn"
          cache-dependency-path: ./web/yarn.lock
      - run: yarn install
        working-directory: ./web
@@ -137,7 +140,7 @@ jobs:
        with:
          browser: chrome
          start: yarn start
-          wait-on: 'http://localhost:7001'
+          wait-on: "http://localhost:7001"
          wait-on-timeout: 210
          working-directory: ./web

@@ -159,7 +162,7 @@ jobs:
      contents: write
      issues: write
    if: github.repository == 'casdoor/casdoor' && github.event_name == 'push'
-    needs: [ frontend, backend, linter, e2e ]
+    needs: [frontend, backend, linter, e2e]
    outputs:
      new-release-published: ${{ steps.semantic.outputs.new_release_published }}
      new-release-version: ${{ steps.semantic.outputs.new_release_version }}
@@ -180,13 +183,18 @@ jobs:
      contents: write
      issues: write
    if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' && needs.tag-release.outputs.new-release-published == 'true'
-    needs: [ tag-release ]
+    needs: [tag-release]
    steps:
      - name: Checkout
        uses: actions/checkout@v4
        with:
          fetch-depth: 0

+      - uses: actions/setup-go@v4
+        with:
+          go-version: ${{ env.GO_VERSION }}
+          cache-dependency-path: ./go.mod
+
      - name: Free disk space
        uses: jlumbroso/free-disk-space@v1.3.1
        with:
@@ -213,7 +221,7 @@ jobs:
        uses: goreleaser/goreleaser-action@v6
        with:
          distribution: goreleaser
-          version: '~> v2'
+          version: "~> v2"
          args: release --clean
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -225,7 +233,7 @@ jobs:
      contents: write
      issues: write
    if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' && needs.tag-release.outputs.new-release-published == 'true'
-    needs: [ tag-release ]
+    needs: [tag-release]
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@@ -295,7 +303,7 @@ jobs:
        if: steps.should_push.outputs.push=='true'
        with:
          repository: casdoor/casdoor-helm
-          ref: 'master'
+          ref: "master"
          token: ${{ secrets.GH_BOT_TOKEN }}

      - name: Update Helm Chart
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,42 +1,26 @@
-linters:
-  disable-all: true
-  enable:
-    - deadcode
-    - dupl
-    - errcheck
-    - goconst
-    - gocyclo
-    - gofmt
-    - goimports
-    - gosec
-    - gosimple
-    - govet
-    - ineffassign
-    - lll
-    - misspell
-    - nakedret
-    - prealloc
-    - staticcheck
-    - structcheck
-    - typecheck
-    - unconvert
-    - unparam
-    - unused
-    - varcheck
-    - revive
-    - exportloopref
+version: "2"
 run:
-  deadline: 5m
-  skip-dirs:
-    - api
-  # skip-files:
-  #   - ".*_test\\.go$"
-  modules-download-mode: mod
-# all available settings of specific linters
-linters-settings:
-  lll:
-    # max line length, lines longer will be reported. Default is 120.
-    # '\t' is counted as 1 character by default, and can be changed with the tab-width option
-    line-length: 150
-    # tab width in spaces. Default to 1.
-    tab-width: 1
+  relative-path-mode: gomod
+  modules-download-mode: vendor
+linters:
+  default: none
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofumpt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
--- a/2
+++ b/2
@@ -9,7 +9,7 @@ RUN yarn install --frozen-lockfile --network-timeout 1000000
 COPY ./web .
 RUN NODE_OPTIONS="--max-old-space-size=4096" yarn run build

-FROM --platform=$BUILDPLATFORM golang:1.24.13 AS BACK
+FROM --platform=$BUILDPLATFORM golang:1.25.8 AS BACK
 WORKDIR /go/src/casdoor

 # Copy only go.mod and go.sum first for dependency caching
--- a/8
+++ b/8
@@ -90,12 +90,12 @@ deps: ## Run dependencies for local development
 	docker compose up -d db

 lint-install: ## Install golangci-lint
-	@# The following installs a specific version of golangci-lint, which is appropriate for a CI server to avoid different results from build to build
-	go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.40.1
+	@# Keep the local golangci-lint version aligned with CI. Both local and CI lint run the gofumpt-only ruleset from .golangci.yml.
+	GOTOOLCHAIN=go1.25.8 go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.11.4

-lint: ## Run golangci-lint
+lint: vendor ## Run golangci-lint
 	@echo "---lint---"
-	golangci-lint run --modules-download-mode=vendor ./...
+	golangci-lint run ./...

 ##@ Deployment

--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
 module github.com/casdoor/casdoor

-go 1.24.0
+go 1.25.0

-toolchain go1.24.13
+toolchain go1.25.8

 require (
 	github.com/Masterminds/squirrel v1.5.3