Merge remote-tracking branch 'upstream/master' into pr/556

bangumi · Dec 10, 2024 · 98fc478 · 98fc478
2 parents f67e767 + 40ab299
commit 98fc478
Show file tree

Hide file tree

Showing 189 changed files with 8,285 additions and 2,550 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -24,9 +24,12 @@ on:
       - "**.go.json"
       - "etc/Dockerfile"
 
+env:
+  GOTOOLCHAIN: "local"
+
 jobs:
   docker:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4
@@ -46,7 +49,6 @@ jobs:
           key: go-cache-122-${{ hashFiles('**/go.sum') }}-build
           restore-keys: |
             go-cache-122-${{ hashFiles('**/go.sum') }}-
-            go-cache-122-
 
       - name: Install Task
         uses: arduino/setup-task@v2

diff --git a/.github/workflows/lint-review.yaml b/.github/workflows/lint-review.yaml
@@ -8,6 +8,9 @@ on:
 permissions:
   contents: read
 
+env:
+  GOTOOLCHAIN: "local"
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -29,4 +32,4 @@ jobs:
 
       - run: gofmt -w -s .
 
-      - uses: autofix-ci/action@ea32e3a12414e6d3183163c3424a7d7a8631ad84
+      - uses: autofix-ci/action@ff86a557419858bb967097bfc916833f5647fa8c
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -22,9 +22,12 @@ on:
       - ".golangci.yaml"
       - ".github/workflows/lint.yaml"
 
+env:
+  GOTOOLCHAIN: "local"
+
 jobs:
   lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
@@ -43,13 +46,10 @@ jobs:
           key: go-cache-122-${{ hashFiles('**/go.sum') }}-lint
           restore-keys: |
             go-cache-122-${{ hashFiles('**/go.sum') }}-
-            go-cache-122-
 
       - run: go get -t ./...
 
       - name: Run linters
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.57.2
-          skip-pkg-cache: true
-          skip-build-cache: true
+          version: v1.61.0
diff --git a/.github/workflows/release-docker.yaml b/.github/workflows/release-docker.yaml
@@ -4,17 +4,20 @@ on:
   push:
     tags:
       - "v*.*.*"
-    branches:
-      - master
+    branches-ignore:
+      - "renovate/**"
 
 permissions:
   packages: write
 
+env:
+  GOTOOLCHAIN: "local"
+
 jobs:
   docker:
     name: "docker"
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       IMAGE: "ghcr.io/${{ github.repository_owner }}/chii"
 
@@ -36,7 +39,6 @@ jobs:
           key: go-cache-122-${{ hashFiles('**/go.sum') }}-build
           restore-keys: |
             go-cache-122-${{ hashFiles('**/go.sum') }}-
-            go-cache-122-
 
       - run: echo "SHA=${GITHUB_REF##*/}" >> $GITHUB_ENV
         if: "${{ startsWith(github.ref, 'refs/tags/') }}"
@@ -63,6 +65,7 @@ jobs:
           images: ${{ env.IMAGE }}
           tags: |
             type=semver,event=tag,pattern=v{{version}}
+            type=raw,value={{commit_date 'YYYY-MM-DD'}}-{{sha}}
 
             type=ref,event=branch
             type=ref,event=branch,suffix=-${{ env.SHA }}
@@ -74,7 +77,7 @@ jobs:
           password: ${{ github.token }}
 
       - name: Build Final Docker Image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./
           provenance: false

diff --git a/.github/workflows/release-openapi.yaml b/.github/workflows/release-openapi.yaml
@@ -2,18 +2,21 @@ name: Release(openapi)
 
 on:
   push:
-    tags:
-      - "v*.*.*"
+    branches:
+      - master
   workflow_dispatch:
 
+env:
+  GOTOOLCHAIN: "local"
+
 jobs:
   openapi:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - run: npm ci
       - run: npm run build
@@ -26,26 +29,11 @@ jobs:
       - run: cp ./dist/v0.yaml ./api/open-api/v0.yaml
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           path: api
           token: ${{ secrets.PAT }}
           title: Update Openapi Specification from bangumi/server
           push-to-fork: Trim21-bot/api
           branch: "update-upstream"
           author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
-
-      - uses: actions/checkout@v4
-        with:
-          repository: "bangumi/dev-docs"
-          path: dev-docs
-#      - run: cp ./dist/private.yaml ./dev-docs/api.yaml
-#      - name: Create Pull Request
-#        uses: peter-evans/create-pull-request@v4
-#        with:
-#          path: dev-docs
-#          token: ${{ secrets.PAT }}
-#          title: Update Openapi Specification from bangumi/server
-#          push-to-fork: Trim21-bot/dev-docs
-#          branch: "update-upstream"
-#          author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -5,9 +5,12 @@ on:
     tags:
       - "v*.*.*"
 
+env:
+  GOTOOLCHAIN: "local"
+
 jobs:
   github:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/test-openapi.yaml b/.github/workflows/test-openapi.yaml
@@ -18,6 +18,9 @@ on:
       - "package-lock.json"
       - ".github/workflows/test-openapi.yaml"
 
+env:
+  GOTOOLCHAIN: "local"
+
 jobs:
   test:
     runs-on: "${{ matrix.os }}"

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -22,12 +22,15 @@ on:
       - "**.go"
       - "**.go.json"
 
+env:
+  GOTOOLCHAIN: "local"
+
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - run: git clone https://github.com/bangumi/dev-env $HOME/dev-env
-      - run: cd ~/dev-env && docker-compose up -d
+      - run: cd ~/dev-env && docker compose up -d
 
       - uses: actions/checkout@v4
         with:
@@ -53,7 +56,6 @@ jobs:
           key: go-cache-122-${{ hashFiles('**/go.sum') }}-test
           restore-keys: |
             go-cache-122-${{ hashFiles('**/go.sum') }}-
-            go-cache-122-
 
       - run: go get -t ./...
 
@@ -70,7 +72,7 @@ jobs:
           MYSQL_DB: bangumi
           REDIS_URI: "redis://:[email protected]:6379/0"
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           files: coverage.out
           token: ${{ secrets.CODECOV_TOKEN }} # required
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -18,9 +18,7 @@ run:
   # If false (default) - golangci-lint acquires file lock on start.
   allow-parallel-runners: true
 
-  skip-files: []
-
-  go: "1.22"
+  go: "1.23"
 
 # output configuration options
 output:
@@ -106,8 +104,6 @@ linters-settings:
       - standard # Captures all standard packages if they do not match another section.
       - default # Contains all imports that could not be matched to another section type.
       - prefix(github.com/bangumi/server) # Groups all imports with the specified Prefix.
-    sectionSeparators:
-      - newLine
 
   depguard:
     rules:
@@ -131,7 +127,7 @@ linters-settings:
           - pkg: "github.com/golang/mock"
             desc: 'use "github.com/stretchr/testify/mock" and "github.com/vektra/mockery"'
 
-  gomnd:
+  mnd:
     # settings:
     # mnd:
     # the list of enabled checks, see https://github.com/tommy-muehle/go-mnd/#checks for description.
@@ -141,8 +137,8 @@ linters-settings:
       - operation
       - return
       - assign
-    ignored-functions: strconv\..*,time\..*,make,math\..*,strings\..*
-    ignored-numbers: 1,2,3,10,100,1000,10000
+    ignored-functions: [strconv\..*, time\..*, make, math\..*, strings\..*]
+    ignored-numbers: ["1", "2", "3", "10", "100", "1000", "10000"]
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
@@ -181,7 +177,7 @@ linters-settings:
     checks: ["all"]
 
   stylecheck:
-    # Select the Go version to target. The default is '1.13'.
+  # Select the Go version to target. The default is '1.13'.
 
   testpackage:
     # regexp pattern to skip files
@@ -203,12 +199,9 @@ linters-settings:
   nlreturn:
     block-size: 3
 
-  ifshort:
-    # Maximum length of vars declaration measured in number of lines, after which linter won't suggest using short syntax.
-    # Has higher priority than max-decl-chars.
-    max-decl-lines: 1
-    # Maximum length of vars declaration measured in number of characters, after which linter won't suggest using short syntax.
-    max-decl-chars: 30
+  gosec:
+    excludes:
+      - G115
 
   tagliatelle:
     # Check the struck tag name case.
@@ -236,8 +229,9 @@ linters:
     - errchkjson
     - errname
     - errorlint
+    #    https://github.com/golangci/golangci-lint/issues/5065
     - exhaustive
-    - exportloopref
+    - copyloopvar
     - forbidigo
     - forcetypeassert
     - funlen
@@ -250,9 +244,8 @@ linters:
     - gocritic
     - gocyclo
     - godot
-    - goerr113
     - gofmt
-    - gomnd
+    - mnd
     - gomoddirectives
     - gomodguard
     - goprintffuncname
@@ -319,7 +312,7 @@ issues:
     - source: 'var .* sync\.Once'
       linters: [gochecknoglobals]
 
-    - linters: [goerr113, errorlint]
+    - linters: [err113, errorlint]
       source: "if err == redis.Nil {"
 
     # https://github.com/kunwardeep/paralleltest/issues/8

diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -27,15 +27,15 @@ tasks:
     generates:
       - ./dist/chii.exe
     cmds:
-      - go build -ldflags '-w -s' -trimpath -o dist/chii.exe main.go
+      - go build -trimpath -o dist/chii.exe main.go
     env:
       CGO_ENABLED: "0"
 
   lint:
     silent: true
     desc: Run 'golangci-lint'
     cmds:
-      - golangci-lint run --fix
+      - golangci-lint --path-prefix  "{{ .TASKFILE_DIR }}" run --fix
 
   test:
     desc: Run mocked tests, need nothing.
@@ -44,6 +44,31 @@ tasks:
     env:
       CGO_ENABLED: "0"
 
+  web:
+    desc: Run Web Server
+    aliases:
+      - serve
+      - server
+    cmds:
+      - go run main.go --config config.yaml web
+
+  consumer:
+    desc: Run Kafka Consumer
+    aliases:
+      - canal
+    cmds:
+      - go run main.go canal --config config.yaml
+
+  openapi-test:
+    desc: Test OpenAPI Schema
+    cmds:
+      - npm run test
+
+  openapi:
+    desc: Build OpenAPI Schema
+    cmds:
+      - npm run build
+
   bench:
     desc: Run benchmark
     cmds: