chore: improve golangci-lint.yml, upgrade dependencies, and optimize code and comments (#4025)

Author: houseme

.github/workflows/golangci-lint.yml

@@ -15,6 +15,15 @@ on:
       - enhance/**
       - fix/**
       - feat/**
+  pull_request:
+    branches:
+      - master
+      - develop
+      - personal/**
+      - feature/**
+      - enhance/**
+      - fix/**
+      - feat/**
 
 jobs:
   golangci:
@@ -33,11 +42,11 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          # Required: specify the golangci-lint version without the patch version to always use the latest patch.
           version: v1.62.2
           only-new-issues: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          args: --timeout 3m0s --fix
+          args: --timeout 3m0s
       - name: Install gci
         run: go install github.com/daixiang0/gci@latest
       - name: Run gci
@@ -55,6 +64,8 @@ jobs:
           -s "prefix(github.com/gogf/gf/example)" \
           ./
       - name: Check for changes
+        # Check if the event is a push or a pull request from a forked repository
+        if: github.event_name == 'push'|| (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true)
         run: |
           if [[ -n "$(git status --porcelain)" ]]; then
           echo "HAS_CHANGES=true" >> $GITHUB_ENV

.github/workflows/sonarcloud.yaml

@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 # Declare default permissions as read only.
-permissions: read-all
+permissions: read
 
 jobs:
   analysis:
@@ -34,7 +34,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        uses: ossf/scorecard-action@v2.4.0 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif

Makefile

@@ -13,7 +13,7 @@ tidy:
 
 .PHONY: lint
 lint:
-	golangci-lint run
+	golangci-lint run -c .golangci.yml
 
 # make version to=v2.4.0
 .PHONY: version

README.MD

@@ -1,6 +1,6 @@
 
 <div align=center>
-<img src="https://goframe.org/img/logo_full.png" width="300"/>
+<img src="https://goframe.org/img/logo_full.png" width="300" alt="goframe gf logo"/>
 
 [![Go Reference](https://pkg.go.dev/badge/github.com/gogf/gf/v2.svg)](https://pkg.go.dev/github.com/gogf/gf/v2)
 [![GoFrame CI](https://github.com/gogf/gf/actions/workflows/ci-main.yml/badge.svg)](https://github.com/gogf/gf/actions/workflows/ci-main.yml)
@@ -36,7 +36,7 @@ A powerful framework for faster, easier, and more efficient project development.
 💖 [Thanks to all the contributors who made GoFrame possible](https://github.com/gogf/gf/graphs/contributors) 💖
 
 <a href="https://github.com/gogf/gf/graphs/contributors">
-<img src="https://goframe.org/img/contributors.svg?version=v2.8.2" />
+<img src="https://goframe.org/img/contributors.svg?version=v2.8.2" alt="goframe contributors"/>
 </a>
 
 # License

cmd/gf/gfcmd/gfcmd.go

@@ -4,6 +4,7 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
+// Package gfcmd provides the management of CLI commands for `gf` tool.
 package gfcmd
 
 import (
@@ -25,9 +26,7 @@ import (
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
-const (
-	cliFolderName = `hack`
-)
+const cliFolderName = `hack`
 
 // Command manages the CLI command of `gf`.
 // This struct can be globally accessible and extended with custom struct.

cmd/gf/go.mod

@@ -1,6 +1,6 @@
 module github.com/gogf/gf/cmd/gf/v2
 
-go 1.18
+go 1.20
 
 require (
 	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.8.2

cmd/gf/go.work

@@ -1,4 +1,4 @@
-go 1.18
+go 1.20
 
 use (
 	./

cmd/gf/internal/cmd/cmd.go

@@ -4,6 +4,7 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
+// Package cmd provides the management of CLI commands for `gf` tool.
 package cmd
 
 import (
@@ -19,9 +20,8 @@ import (
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
-var (
-	GF = cGF{}
-)
+// GF is the management object for `gf` command line tool.
+var GF = cGF{}
 
 type cGF struct {
 	g.Meta `name:"gf" ad:"{cGFAd}"`

cmd/gf/main.go

@@ -16,9 +16,10 @@ import (
 
 func main() {
 	var (
-		ctx = gctx.GetInitCtx()
+		ctx          = gctx.GetInitCtx()
+		command, err = gfcmd.GetCommand(ctx)
 	)
-	command, err := gfcmd.GetCommand(ctx)
+
 	if err != nil {
 		mlog.Fatalf(`%+v`, err)
 	}

contrib/config/apollo/go.mod

@@ -11,17 +11,17 @@ require (
 	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/fatih/color v1.17.0 // indirect
+	github.com/fatih/color v1.18.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/magiconair/properties v1.8.9 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pelletier/go-toml v1.9.3 // indirect
@@ -36,9 +36,9 @@ require (
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/net v0.32.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/ini.v1 v1.62.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect