From 15b18081df894a8ca7d8ca833e203c2587495cf0 Mon Sep 17 00:00:00 2001 From: qianz Date: Tue, 11 Feb 2025 20:03:20 +0800 Subject: [PATCH 1/2] feat:fix github action Update go.yml --- .github/workflows/go.yml | 6 ++---- network/netstack/socket/socket_test.go | 12 ++++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 9d255d3..385e475 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: self-hosted steps: - uses: actions/checkout@v4 @@ -20,9 +20,7 @@ jobs: uses: actions/setup-go@v4 with: go-version: '1.22.2' - - - name: Change directory to network/netstack - run: cd network/netstack - name: Test netstack + working-directory: ./network/netstack run: sudo go test -v -race ./... diff --git a/network/netstack/socket/socket_test.go b/network/netstack/socket/socket_test.go index 757f2d2..7a650a9 100755 --- a/network/netstack/socket/socket_test.go +++ b/network/netstack/socket/socket_test.go @@ -28,9 +28,17 @@ func TestSocketServer(t *testing.T) { serverSeq: 1, } - listenSock := NewSocket(NewNetwork(context.Background(), nil, NetworkOptions{Seq: args.serverSeq})) + network := NewNetwork( + context.Background(), + nil, + NetworkOptions{ + Seq: args.serverSeq, + Debug: true, + }, + ) + listenSock := NewSocket(network) InitListenSocket(listenSock) - listenSock.acceptQueue = make(chan *Socket, defaultNetwork.opt.SoMaxConn) + listenSock.acceptQueue = make(chan *Socket, network.opt.SoMaxConn) connectSock := NewSocket(listenSock.network) InitConnectSocket( From 3ad19d8a6a08b7a018c10437306f612142855c4b Mon Sep 17 00:00:00 2001 From: qianz Date: Tue, 11 Feb 2025 20:35:23 +0800 Subject: [PATCH 2/2] feat:use officer runner --- .github/workflows/go.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 385e475..d75f62a 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -5,22 +5,21 @@ name: Go on: push: - branches: [ "master" ] + branches: ["master"] pull_request: - branches: [ "master" ] + branches: ["master"] jobs: - build: - runs-on: self-hosted + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4 + + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: "1.22.2" - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.22.2' - - - name: Test netstack - working-directory: ./network/netstack - run: sudo go test -v -race ./... + - name: Test netstack + working-directory: ./network/netstack + run: sudo go test -v -race ./...