Skip to content

Commit 5a333a7

Browse files
M09Icclaude
andcommitted
fix(ci): remove unix tunnel references and fix Go version
- Remove protocol/tunnel/unix import (package not in community edition) - Remove tunnel-unix CI job - Fix nightly-release Go version from 1.18 to 1.21 (go.mod requires 1.20) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent cfdf0e9 commit 5a333a7

4 files changed

Lines changed: 1 addition & 27 deletions

File tree

.github/workflows/nightly-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Set up Go
3535
uses: actions/setup-go@v3
3636
with:
37-
go-version: 1.18
37+
go-version: "1.21"
3838

3939
- name: Set Version Info
4040
run: |

.github/workflows/test.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -526,28 +526,6 @@ jobs:
526526
env:
527527
REM_TEST_ICMP: "1"
528528

529-
tunnel-unix:
530-
name: "Tunnel: Unix domain socket"
531-
runs-on: ubuntu-22.04
532-
needs: [unit-tests]
533-
steps:
534-
- uses: actions/checkout@v4
535-
536-
- name: Set up Go
537-
uses: actions/setup-go@v5
538-
with:
539-
go-version: "1.21"
540-
cache: true
541-
542-
- name: Install gox
543-
run: go install github.com/mitchellh/gox@latest
544-
545-
- name: Build Unix tunnel
546-
run: bash build.sh -a "socks" -t "unix" -o "linux/amd64"
547-
548-
- name: Test Unix tunnel
549-
run: go test -v -timeout 5m -run '^TestE2E_Unix' ./runner/
550-
551529
tunnel-dns:
552530
name: "Tunnel: DNS (KCP over UDP)"
553531
runs-on: ubuntu-22.04

protocol/tunnel/registry_matrix_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
_ "github.com/chainreactors/rem/protocol/tunnel/streamhttp"
1616
_ "github.com/chainreactors/rem/protocol/tunnel/tcp"
1717
_ "github.com/chainreactors/rem/protocol/tunnel/udp"
18-
_ "github.com/chainreactors/rem/protocol/tunnel/unix"
1918
_ "github.com/chainreactors/rem/protocol/tunnel/websocket"
2019

2120
"github.com/chainreactors/rem/protocol/core"
@@ -32,7 +31,6 @@ func TestRegisteredTunnelDialersConstruct(t *testing.T) {
3231
{rawURL: "http2+raw://127.0.0.1:8443/rem?wrapper=raw", tunnelName: core.HTTP2Tunnel},
3332
{rawURL: "streamhttp+raw://127.0.0.1:8080/rem?wrapper=raw", tunnelName: core.StreamHTTPTunnel},
3433
{rawURL: "websocket+raw://127.0.0.1:8080/rem?wrapper=raw", tunnelName: core.WebSocketTunnel},
35-
{rawURL: "unix+raw://127.0.0.1:0/rem?pipe=rem-test&wrapper=raw", tunnelName: core.UNIXTunnel},
3634
{rawURL: "memory+socks://alice:secret@rem-pipe?wrapper=raw", tunnelName: core.MemoryTunnel},
3735
{rawURL: "dns+raw://127.0.0.1:5353/rem?domain=test.local&wrapper=raw", tunnelName: core.DNSTunnel},
3836
{rawURL: "icmp+raw://127.0.0.1:0/rem?wrapper=raw", tunnelName: core.ICMPTunnel},
@@ -63,7 +61,6 @@ func TestRegisteredTunnelListenersConstruct(t *testing.T) {
6361
{rawURL: "http2+raw://127.0.0.1:8443/rem?wrapper=raw", tunnelName: core.HTTP2Tunnel},
6462
{rawURL: "streamhttp+raw://127.0.0.1:8080/rem?wrapper=raw", tunnelName: core.StreamHTTPTunnel},
6563
{rawURL: "websocket+raw://127.0.0.1:8080/rem?wrapper=raw", tunnelName: core.WebSocketTunnel},
66-
{rawURL: "unix+raw://127.0.0.1:0/rem?pipe=rem-test&wrapper=raw", tunnelName: core.UNIXTunnel},
6764
{rawURL: "memory+socks://alice:secret@rem-pipe?wrapper=raw", tunnelName: core.MemoryTunnel},
6865
{rawURL: "dns+raw://127.0.0.1:5353/rem?domain=test.local&wrapper=raw", tunnelName: core.DNSTunnel},
6966
{rawURL: "icmp+raw://127.0.0.1:0/rem?wrapper=raw", tunnelName: core.ICMPTunnel},

runner/e2e_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import (
4646
_ "github.com/chainreactors/rem/protocol/tunnel/streamhttp"
4747
_ "github.com/chainreactors/rem/protocol/tunnel/tcp"
4848
_ "github.com/chainreactors/rem/protocol/tunnel/udp"
49-
_ "github.com/chainreactors/rem/protocol/tunnel/unix"
5049
_ "github.com/chainreactors/rem/protocol/tunnel/websocket"
5150
_ "github.com/chainreactors/rem/protocol/wrapper"
5251
"github.com/chainreactors/rem/x/cryptor"

0 commit comments

Comments
 (0)