Merge pull request #92 from marsevilspirit/refactor/ci

refactor(ci): big refactor for upgrade to go 1.25

Author: AlexStocks

.github/workflows/github-actions.yml

@@ -7,61 +7,61 @@ on:
     branches: "*"
 
 jobs:
+  license:
+    name: Check License Header
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check License Header
+        uses: apache/skywalking-eyes/header@main #NOSONAR
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          config: .licenserc.yaml
+          mode: check
 
-  build:
-    name: Build
+  CI:
+    name: CI
     runs-on: ${{ matrix.os }}
     strategy:
       # If you want to matrix build , you can append the following list.
       matrix:
         go_version:
-          - '1.20'
+          - '1.25'
         os:
           - ubuntu-latest
 
     steps:
 
     - name: Set up Go ${{ matrix.go_version }}
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go_version }}
-      id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Cache Go Dependence
-      uses: actions/cache@v2
+      # ref: https://github.com/actions/cache/blob/main/examples.md#go---module
+      uses: actions/cache@v4
       with:
-        path: ~/go/pkg/mod
+        # Cache, works only on Linux
+        path: |
+          ~/.cache/go-build
+          ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        # An ordered list of keys to use for restoring the cache if no cache hit occurred for key
         restore-keys: ${{ runner.os }}-go-
 
-    - name: Get dependencies
-      run: |
-        if [ -f Gopkg.toml ]; then
-            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-            dep ensure
-        else
-            go get -v -t -d ./...
-        fi
-
-    - name: License Check
-      run: |
-        sh before_validate_license.sh
-        chmod u+x /tmp/tools/license/license-header-checker
-        go fmt ./... && [[ -z `git status -s` ]]
-        /tmp/tools/license/license-header-checker -v -a -r -i vendor  /tmp/tools/license/license.txt . go  && [[ -z `git status -s` ]]
+    - name: Check Code Format
+      run: make fmt && git status && [[ -z `git status -s` ]]
 
-    - name: Install go ci lint
-      run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.56.0
+    - name: Unit Test
+      run: make test
 
-    - name: Run Linter
-      run: golangci-lint run --timeout=10m -v --disable-all --enable=govet --enable=staticcheck --enable=ineffassign --enable=misspell
-
-    - name: Test
-      run: go mod vendor && go test $(go list ./... | grep -v vendor | grep -v demo) -coverprofile=coverage.txt -covermode=atomic
+    - name: Lint
+      run: make lint
 
     - name: Coverage
       run: bash <(curl -s https://codecov.io/bash)
-

.gitignore

@@ -20,3 +20,5 @@ classes
 *.swp
 
 vendor/
+
+coverage.txt

.licenserc.yaml

@@ -0,0 +1,48 @@
+header:
+  license:
+    spdx-id: Apache-2.0
+    content: |
+      Licensed to the Apache Software Foundation (ASF) under one or more
+      contributor license agreements.  See the NOTICE file distributed with
+      this work for additional information regarding copyright ownership.
+      The ASF licenses this file to You under the Apache License, Version 2.0
+      (the "License"); you may not use this file except in compliance with
+      the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+  paths-ignore:
+    - '**/*.md'
+    - '**/*.json'
+    - '**/*.properties'
+    - '**/*.proto'
+    - '**/*.tpl'
+    - '**/*.crt'
+    - '**/*.key'
+    - '**/*.js'
+    - '**/*.css'
+    - '**/go.mod'
+    - '**/go.sum'
+    - '.git/'
+    - '.github/**'
+    - '.gitignore'
+    - '.gitmodules'
+    - 'LICENSE'
+    - 'NOTICE'
+    - '**/*.hessian2.go'
+    - '**/*.triple.openapi.yaml'
+    - 'protocol/triple/triple_protocol'
+    - 'protocol/triple/reflection/serverreflection.go'
+
+  comment: on-failure
+
+# If you don't want to check dependencies' license compatibility, remove the following part
+dependency:
+  files:
+    - go.mod

.travis.yml

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 language: go
 
 os:

Makefile

@@ -0,0 +1,55 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+SHELL := bash
+.DELETE_ON_ERROR:
+.DEFAULT_GOAL := help
+.SHELLFLAGS := -eu -o pipefail -c
+MAKEFLAGS += --warn-undefined-variables
+MAKEFLAGS += --no-builtin-rules
+MAKEFLAGS += --no-print-directory
+
+.PHONY: help test fmt clean lint
+
+help:
+	@echo "Available commands:"
+	@echo "  test       - Run unit tests"
+	@echo "  clean      - Clean test generate files"
+	@echo "  fmt        - Format code"
+	@echo "  lint       - Run golangci-lint"
+
+# Run unit tests
+test: clean
+	# For go 1.25.0
+	go env -w GOTOOLCHAIN=go1.25.0+auto
+	go test ./... -coverprofile=coverage.txt -covermode=atomic
+
+fmt: install-imports-formatter
+	go fmt ./... && GOROOT=$(shell go env GOROOT) imports-formatter
+
+# Clean test generate files
+clean:
+	rm -rf coverage.txt
+
+# Run golangci-lint
+lint: install-golangci-lint
+	go vet ./...
+	golangci-lint run ./... --timeout=10m
+
+install-golangci-lint:
+	go install github.com/golangci/golangci-lint/v2/cmd/[email protected]
+
+install-imports-formatter:
+	go install github.com/dubbogo/tools/cmd/imports-formatter@latest

before_validate_license.sh

@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # ******************************************************
 # DESC    :
 # AUTHOR  : Alex Stocks
@@ -22,9 +37,9 @@ cd echo/ws-echo/server && sh assembly/mac/dev.sh && rm -rf target && cd -
 cd echo/wss-echo/client && sh assembly/mac/dev.sh && rm -rf target && cd -
 cd echo/wss-echo/server && sh assembly/mac/dev.sh && rm -rf target && cd -
 
-cd rpc/client && sh assembly/mac/dev.sh && rm -rf target && cd -
-cd rpc/server && sh assembly/mac/dev.sh && rm -rf target && cd -
+# cd rpc/client && sh assembly/mac/dev.sh && rm -rf target && cd -
+# cd rpc/server && sh assembly/mac/dev.sh && rm -rf target && cd -
 
-cd micro/client && sh assembly/mac/dev.sh && rm -rf target && cd -
-cd micro/server && sh assembly/mac/dev.sh && rm -rf target && cd -
+# cd micro/client && sh assembly/mac/dev.sh && rm -rf target && cd -
+# cd micro/server && sh assembly/mac/dev.sh && rm -rf target && cd -
 

examples/build_all.sh

@@ -26,19 +26,16 @@ import (
 
 import (
 	"github.com/AlexStocks/getty/transport"
-)
-
-import (
 	log "github.com/AlexStocks/getty/util"
 )
 
 var (
 	reqID uint32
-	src   = rand.NewSource(time.Now().UnixNano())
+	r     *rand.Rand
 )
 
 func init() {
-	rand.Seed(time.Now().UnixNano())
+	r = rand.New(rand.NewSource(time.Now().UnixNano()))
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -52,11 +49,7 @@ type EchoClient struct {
 }
 
 func (c *EchoClient) isAvailable() bool {
-	if c.selectSession() == nil {
-		return false
-	}
-
-	return true
+	return c.selectSession() != nil
 }
 
 func (c *EchoClient) close() {
@@ -84,7 +77,7 @@ func (c *EchoClient) selectSession() getty.Session {
 		return nil
 	}
 
-	return c.sessions[rand.Int31n(int32(count))].session
+	return c.sessions[r.Int31n(int32(count))].session
 }
 
 func (c *EchoClient) addSession(session getty.Session) {
@@ -159,7 +152,7 @@ func (c *EchoClient) getClientEchoSession(session getty.Session) (clientEchoSess
 func (c *EchoClient) heartbeat(session getty.Session) {
 	var pkg EchoPackage
 	pkg.H.Magic = echoPkgMagic
-	pkg.H.LogID = (uint32)(src.Int63())
+	pkg.H.LogID = (uint32)(r.Int63())
 	pkg.H.Sequence = atomic.AddUint32(&reqID, 1)
 	// pkg.H.ServiceID = 0
 	pkg.H.Command = heartbeatCmd