Merge pull request #480 from panjf2000/dev

ver: release v2.3.0

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -65,6 +65,22 @@ body:
         - BSD
     validations:
       required: true
+  - type: input
+    id: os-version
+    attributes:
+      label: OS version
+      description: What's the specific version of OS?
+      placeholder: "Run `uname -srm` command to get the info, for example: Darwin 21.5.0 arm64, Linux 5.4.0-137-generic x86_64"
+    validations:
+      required: true
+  - type: input
+    id: go-version
+    attributes:
+      label: Go version
+      description: What's the specific version of Go?
+      placeholder: "Run `go version` command to get the info, for example: go1.20.5 linux/amd64"
+    validations:
+      required: true
   - type: textarea
     id: logs
     attributes:

.github/workflows/codeql.yml

@@ -8,13 +8,19 @@ on:
       - 1.x
     paths-ignore:
       - '**.md'
+      - '**.yml'
+      - '**.yaml'
+      - '!.github/workflows/codeql.yml'
   pull_request:
     branches:
       - master
       - dev
       - 1.x
     paths-ignore:
       - '**.md'
+      - '**.yml'
+      - '**.yaml'
+      - '!.github/workflows/codeql.yml'
   schedule:
     #        ┌───────────── minute (0 - 59)
     #        │  ┌───────────── hour (0 - 23)

.github/workflows/pull-request.yml

@@ -0,0 +1,19 @@
+name: Check pull request target
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+    branches:
+      - master
+jobs:
+  check-branches:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check target branch
+        run: |
+          if [ ${{ github.head_ref }} != "dev" ]; then
+            echo "Only pull requests from dev branch are only allowed to be merged into master branch."
+            exit 1
+          fi

.github/workflows/test.yml

@@ -8,13 +8,19 @@ on:
       - 1.x
     paths-ignore:
       - '**.md'
+      - '**.yml'
+      - '**.yaml'
+      - '!.github/workflows/test.yml'
   pull_request:
     branches:
       - master
       - dev
       - 1.x
     paths-ignore:
       - '**.md'
+      - '**.yml'
+      - '**.yaml'
+      - '!.github/workflows/test.yml'
 
 env:
   GO111MODULE: on

.github/workflows/test_gc_opt.yml

@@ -8,13 +8,19 @@ on:
       - 1.x
     paths-ignore:
       - '**.md'
+      - '**.yml'
+      - '**.yaml'
+      - '!.github/workflows/test_gc_opt.yml'
   pull_request:
     branches:
       - master
       - dev
       - 1.x
     paths-ignore:
       - '**.md'
+      - '**.yml'
+      - '**.yaml'
+      - '!.github/workflows/test_gc_opt.yml'
 
 env:
   GO111MODULE: on

.github/workflows/test_poll_opt.yml

@@ -8,13 +8,19 @@ on:
       - 1.x
     paths-ignore:
       - '**.md'
+      - '**.yml'
+      - '**.yaml'
+      - '!.github/workflows/test_poll_opt.yml'
   pull_request:
     branches:
       - master
       - dev
       - 1.x
     paths-ignore:
       - '**.md'
+      - '**.yml'
+      - '**.yaml'
+      - '!.github/workflows/test_poll_opt.yml'
 
 env:
   GO111MODULE: on

.github/workflows/test_poll_opt_gc_opt.yml

@@ -8,13 +8,19 @@ on:
       - 1.x
     paths-ignore:
       - '**.md'
+      - '**.yml'
+      - '**.yaml'
+      - '!.github/workflows/test_poll_opt_gc_opt.yml'
   pull_request:
     branches:
       - master
       - dev
       - 1.x
     paths-ignore:
       - '**.md'
+      - '**.yml'
+      - '**.yaml'
+      - '!.github/workflows/test_poll_opt_gc_opt.yml'
 
 env:
   GO111MODULE: on

conn_matrix.go

@@ -107,6 +107,7 @@ func (cm *connMatrix) delConn(c *conn) {
 		if cm.connCounts[row] == 0 {
 			continue
 		}
+
 		columnMin := -1
 		if row == cgfd.ConnMatrixRow() {
 			columnMin = cgfd.ConnMatrixColumn()

conn_matrix_test.go

@@ -105,9 +105,8 @@ func testConnMatrix(t *testing.T, n int) {
 			if !ok {
 				t.Fatalf("missing gfd for fd %d", c.fd)
 			}
-			if i != gfd.ConnMatrixRow() || j != gfd.ConnMatrixColumn() {
-				t.Fatalf("unexpected row %d, column %d, expected row %d, column %d",
-					gfd.ConnMatrixRow(), gfd.ConnMatrixColumn(), i, j)
+			if gfd != c.gfd {
+				t.Fatalf("expected gfd: %v, but got gfd: %v", c.gfd, gfd)
 			}
 		}
 	}