Skip to content

Commit 98cfe18

Browse files
LoyalsoldierLoyalsoldier
authored
Chore: use Go v1.17 & support Windows ARM64 (#377)
* Chore: use Go v1.17 & support Windows ARM64 * Chore: update workflow
1 parent 07fec5e commit 98cfe18

File tree

8 files changed

+132
-68
lines changed

8 files changed

+132
-68
lines changed

‎.github/workflows/nightly-build.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
go-version: ["1.16"]
27+
go-version: ["1.17"]
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Install Go
@@ -37,5 +37,4 @@ jobs:
3737

3838
- name: Build
3939
run: |
40-
make geosite.dat geoip.dat
4140
make release -j$(nproc)

‎.github/workflows/release-build.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- name: Install Go
1111
uses: actions/setup-go@v2
1212
with:
13-
go-version: "1.16"
13+
go-version: "1.17"
1414

1515
- name: Checkout code
1616
uses: actions/checkout@v2
@@ -25,15 +25,13 @@ jobs:
2525
2626
- name: Build
2727
run: |
28-
make geosite.dat geoip.dat
2928
make release -j$(nproc)
3029
3130
- name: Release
32-
uses: softprops/action-gh-release@v1
31+
uses: svenstaro/upload-release-action@v2
3332
with:
34-
draft: true
35-
name: ${{ env.TAG_NAME }}
36-
tag_name: ${{ env.TAG_NAME }}
37-
files: ./trojan-go-*.zip
38-
env:
39-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33+
repo_token: ${{ secrets.GITHUB_TOKEN }}
34+
tag: ${{ env.TAG_NAME }}
35+
file: ./trojan-go-*.zip
36+
file_glob: true
37+
prerelease: true

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
go-version: ["1.16"]
25+
go-version: ["1.17"]
2626
platform: [ubuntu-latest, windows-latest, macos-latest]
2727
runs-on: ${{ matrix.platform }}
2828
steps:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# Dependency directories (remove the comment below to include it)
1515
# vendor/
1616

17+
build/
1718
*.DS_Store
1819
*.zip
1920
*.tar.gz

‎Makefile‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ clean:
1919
geoip.dat:
2020
wget https://github.com/v2fly/geoip/raw/release/geoip.dat
2121

22+
geoip-only-cn-private.dat:
23+
wget https://github.com/v2fly/geoip/raw/release/geoip-only-cn-private.dat
24+
2225
geosite.dat:
2326
wget https://github.com/v2fly/domain-list-community/raw/release/dlc.dat -O geosite.dat
2427

@@ -30,7 +33,7 @@ trojan-go:
3033
mkdir -p $(BUILD_DIR)
3134
$(GOBUILD)
3235

33-
install: $(BUILD_DIR)/$(NAME) geoip.dat geosite.dat
36+
install: $(BUILD_DIR)/$(NAME) geoip.dat geoip-only-cn-private.dat geosite.dat
3437
mkdir -p /etc/$(NAME)
3538
mkdir -p /usr/share/$(NAME)
3639
cp example/*.json /etc/$(NAME)
@@ -40,7 +43,9 @@ install: $(BUILD_DIR)/$(NAME) geoip.dat geosite.dat
4043
systemctl daemon-reload
4144
cp geosite.dat /usr/share/$(NAME)/geosite.dat
4245
cp geoip.dat /usr/share/$(NAME)/geoip.dat
46+
cp geoip-only-cn-private.dat /usr/share/$(NAME)/geoip-only-cn-private.dat
4347
ln -fs /usr/share/$(NAME)/geoip.dat /usr/bin/
48+
ln -fs /usr/share/$(NAME)/geoip-only-cn-private.dat /usr/bin/
4449
ln -fs /usr/share/$(NAME)/geosite.dat /usr/bin/
4550

4651
uninstall:
@@ -51,19 +56,20 @@ uninstall:
5156
rm -rd /etc/$(NAME)
5257
rm -rd /usr/share/$(NAME)
5358
rm /usr/bin/geoip.dat
59+
rm /usr/bin/geoip-only-cn-private.dat
5460
rm /usr/bin/geosite.dat
5561

56-
%.zip: % geosite.dat geoip.dat
62+
%.zip: % geosite.dat geoip.dat geoip-only-cn-private.dat
5763
@zip -du $(NAME)-$@ -j $(BUILD_DIR)/$</*
5864
@zip -du $(NAME)-$@ example/*
5965
@-zip -du $(NAME)-$@ *.dat
6066
@echo "<<< ---- $(NAME)-$@"
6167

62-
release: geosite.dat geoip.dat darwin-amd64.zip darwin-arm64.zip linux-386.zip linux-amd64.zip \
68+
release: geosite.dat geoip.dat geoip-only-cn-private.dat darwin-amd64.zip darwin-arm64.zip linux-386.zip linux-amd64.zip \
6369
linux-arm.zip linux-armv5.zip linux-armv6.zip linux-armv7.zip linux-armv8.zip \
6470
linux-mips-softfloat.zip linux-mips-hardfloat.zip linux-mipsle-softfloat.zip linux-mipsle-hardfloat.zip \
6571
linux-mips64.zip linux-mips64le.zip freebsd-386.zip freebsd-amd64.zip \
66-
windows-386.zip windows-amd64.zip windows-arm.zip windows-armv6.zip windows-armv7.zip
72+
windows-386.zip windows-amd64.zip windows-arm.zip windows-armv6.zip windows-armv7.zip windows-arm64.zip
6773

6874
darwin-amd64:
6975
mkdir -p $(BUILD_DIR)/$@
@@ -152,3 +158,7 @@ windows-armv6:
152158
windows-armv7:
153159
mkdir -p $(BUILD_DIR)/$@
154160
GOARCH=arm GOOS=windows GOARM=7 $(GOBUILD)/$@
161+
162+
windows-arm64:
163+
mkdir -p $(BUILD_DIR)/$@
164+
GOARCH=arm64 GOOS=windows $(GOBUILD)/$@

‎api/service/api.pb.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,39 @@
11
module github.com/p4gefau1t/trojan-go
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/go-sql-driver/mysql v1.6.0
7-
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
8-
github.com/refraction-networking/utls v0.0.0-20201210053706-2179f286686b
7+
github.com/refraction-networking/utls v0.0.0-20210713165636-0b2885c8c0d4
98
github.com/shadowsocks/go-shadowsocks2 v0.1.5
109
github.com/smartystreets/goconvey v1.6.4
1110
github.com/stretchr/testify v1.7.0
12-
github.com/txthinking/runnergroup v0.0.0-20210326110939-37fc67d0da7c // indirect
13-
github.com/txthinking/socks5 v0.0.0-20210326104807-61b5745ff346
14-
github.com/txthinking/x v0.0.0-20210326105829-476fab902fbe // indirect
15-
github.com/v2fly/v2ray-core/v4 v4.39.2
11+
github.com/txthinking/socks5 v0.0.0-20210716140126-fa1f52a8f2da
12+
github.com/v2fly/v2ray-core/v4 v4.41.1
1613
github.com/xtaci/smux v1.5.15
17-
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
18-
golang.org/x/term v0.0.0-20210503060354-a79de5458b56
19-
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
20-
google.golang.org/grpc v1.38.0
21-
google.golang.org/protobuf v1.26.0
14+
golang.org/x/net v0.0.0-20210825183410-e898025ed96a
15+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
16+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
17+
google.golang.org/grpc v1.40.0
18+
google.golang.org/protobuf v1.27.1
2219
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
2320
)
21+
22+
require (
23+
github.com/davecgh/go-spew v1.1.1 // indirect
24+
github.com/golang/protobuf v1.5.2 // indirect
25+
github.com/gopherjs/gopherjs v0.0.0-20210420193930-a4630ec28c79 // indirect
26+
github.com/jtolds/gls v4.20.0+incompatible // indirect
27+
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
28+
github.com/pires/go-proxyproto v0.6.0 // indirect
29+
github.com/pmezard/go-difflib v1.0.0 // indirect
30+
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
31+
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
32+
github.com/txthinking/runnergroup v0.0.0-20210608031112-152c7c4432bf // indirect
33+
github.com/txthinking/x v0.0.0-20210326105829-476fab902fbe // indirect
34+
go.starlark.net v0.0.0-20210602144842-1cdb82c9e17a // indirect
35+
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
36+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
37+
golang.org/x/text v0.3.6 // indirect
38+
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
39+
)

0 commit comments

Comments
 (0)