Merge branch 'master' into v5

This commit is contained in:
loyalsoldier
2021-04-13 14:19:02 +08:00
49 changed files with 986 additions and 11782 deletions
+7 -2
View File
@@ -98,7 +98,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16.2
go-version: ^1.16.3
- name: Get project dependencies
run: go mod download
@@ -108,6 +108,11 @@ jobs:
mkdir -p build_assets
go build -v -o build_assets/v2ray -trimpath -ldflags "-s -w -buildid=" ./main
- name: Download geo files
run: |
wget -O release/config/geoip.dat "https://raw.githubusercontent.com/v2fly/geoip/release/geoip.dat"
wget -O release/config/geosite.dat "https://raw.githubusercontent.com/v2fly/domain-list-community/release/dlc.dat"
- name: Prepare package
run: cp -v ./release/config/*.* ./build_assets
@@ -154,7 +159,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16.2
go-version: ^1.16.3
- uses: actions/download-artifact@v2
with: