From 98cfe1813143abaae15d125c48bce28c3a3fdc8f Mon Sep 17 00:00:00 2001 From: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com> Date: Sat, 28 Aug 2021 13:17:18 +0800 Subject: [PATCH] Chore: use Go v1.17 & support Windows ARM64 (#377) * Chore: use Go v1.17 & support Windows ARM64 * Chore: update workflow --- .github/workflows/nightly-build.yml | 3 +- .github/workflows/release-build.yml | 16 ++-- .github/workflows/test.yml | 2 +- .gitignore | 1 + Makefile | 18 ++++- api/service/api.pb.go | 4 +- go.mod | 40 +++++++--- go.sum | 116 +++++++++++++++++++--------- 8 files changed, 132 insertions(+), 68 deletions(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 1f6b776f0..811fd78f3 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - go-version: ["1.16"] + go-version: ["1.17"] runs-on: ubuntu-latest steps: - name: Install Go @@ -37,5 +37,4 @@ jobs: - name: Build run: | - make geosite.dat geoip.dat make release -j$(nproc) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index c8aa18ae1..d4a742319 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -10,7 +10,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.16" + go-version: "1.17" - name: Checkout code uses: actions/checkout@v2 @@ -25,15 +25,13 @@ jobs: - name: Build run: | - make geosite.dat geoip.dat make release -j$(nproc) - name: Release - uses: softprops/action-gh-release@v1 + uses: svenstaro/upload-release-action@v2 with: - draft: true - name: ${{ env.TAG_NAME }} - tag_name: ${{ env.TAG_NAME }} - files: ./trojan-go-*.zip - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + repo_token: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ env.TAG_NAME }} + file: ./trojan-go-*.zip + file_glob: true + prerelease: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cd9d71792..2cf54a41c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - go-version: ["1.16"] + go-version: ["1.17"] platform: [ubuntu-latest, windows-latest, macos-latest] runs-on: ${{ matrix.platform }} steps: diff --git a/.gitignore b/.gitignore index 2551e35ee..edd199ff7 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ # Dependency directories (remove the comment below to include it) # vendor/ +build/ *.DS_Store *.zip *.tar.gz diff --git a/Makefile b/Makefile index ae6ef9071..3958e5139 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,9 @@ clean: geoip.dat: wget /~https://github.com/v2fly/geoip/raw/release/geoip.dat +geoip-only-cn-private.dat: + wget /~https://github.com/v2fly/geoip/raw/release/geoip-only-cn-private.dat + geosite.dat: wget /~https://github.com/v2fly/domain-list-community/raw/release/dlc.dat -O geosite.dat @@ -30,7 +33,7 @@ trojan-go: mkdir -p $(BUILD_DIR) $(GOBUILD) -install: $(BUILD_DIR)/$(NAME) geoip.dat geosite.dat +install: $(BUILD_DIR)/$(NAME) geoip.dat geoip-only-cn-private.dat geosite.dat mkdir -p /etc/$(NAME) mkdir -p /usr/share/$(NAME) cp example/*.json /etc/$(NAME) @@ -40,7 +43,9 @@ install: $(BUILD_DIR)/$(NAME) geoip.dat geosite.dat systemctl daemon-reload cp geosite.dat /usr/share/$(NAME)/geosite.dat cp geoip.dat /usr/share/$(NAME)/geoip.dat + cp geoip-only-cn-private.dat /usr/share/$(NAME)/geoip-only-cn-private.dat ln -fs /usr/share/$(NAME)/geoip.dat /usr/bin/ + ln -fs /usr/share/$(NAME)/geoip-only-cn-private.dat /usr/bin/ ln -fs /usr/share/$(NAME)/geosite.dat /usr/bin/ uninstall: @@ -51,19 +56,20 @@ uninstall: rm -rd /etc/$(NAME) rm -rd /usr/share/$(NAME) rm /usr/bin/geoip.dat + rm /usr/bin/geoip-only-cn-private.dat rm /usr/bin/geosite.dat -%.zip: % geosite.dat geoip.dat +%.zip: % geosite.dat geoip.dat geoip-only-cn-private.dat @zip -du $(NAME)-$@ -j $(BUILD_DIR)/$