Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts: # .github/workflows/build-and-push-image.yml # cmd/frpc/sub/verify.go # go.mod # go.sum # pkg/util/version/version.go
2026-08-10 11:55:54 +08:00
parent 0ff5557571 71a2bf30f9
commit 10c313daa6
132 changed files with 11355 additions and 2223 deletions
@@ -22,12 +22,8 @@ jobs:
    - uses: actions/setup-node@v6
      with:
        node-version: '22'
-    - name: Build web assets (frps)
-      run: make build
-      working-directory: web/frps
-    - name: Build web assets (frpc)
-      run: make build
-      working-directory: web/frpc
+    - name: Test and build web assets
+      run: make web-ci
    - name: golangci-lint
      uses: golangci/golangci-lint-action@v9
      with: