From d05d71e59103b2dc69d82a272622fd32df11908b Mon Sep 17 00:00:00 2001 From: nadoo <287492+nadoo@users.noreply.github.com> Date: Mon, 14 Feb 2022 12:12:37 +0800 Subject: [PATCH] ci: uload artifacts after building --- .github/workflows/build.yml | 41 ++++++++++++++++++++++++++++++++++--- .goreleaser.yml | 2 +- config/glider.conf.example | 19 ++++++++++++----- go.mod | 8 ++++---- go.sum | 16 +++++++-------- 5 files changed, 65 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 301c593..ff2bdd3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,7 @@ on: - '*' env: + APP_NAME: glider DOCKERHUB_REPO: nadoo/glider GHCR_REPO: ghcr.io/nadoo/glider PLATFORMS: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 @@ -21,14 +22,16 @@ jobs: with: fetch-depth: 0 - - name: Get Go version + - name: Set Vars run: | - echo "GO_VERSION=$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | grep $(grep -P "go \d+\." go.mod | cut -d " " -f2) | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')" >> $GITHUB_ENV + echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + echo "GO_VERSION=$(grep -P "go \d+\." go.mod | cut -d " " -f2)" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v2 with: - stable: 'false' + stable: false + check-latest: true go-version: '1.18.0-beta2' # go-version: ${{ env.GO_VERSION}} @@ -54,6 +57,38 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Upload Artifact - Linux amd64 + uses: actions/upload-artifact@v2 + if: "!startsWith(github.ref, 'refs/tags/')" + with: + name: ${{ env.APP_NAME }}-dev-${{ env.SHA_SHORT }}-linux-amd64 + path: | + ./dist/default_linux_amd64/${{ env.APP_NAME }} + + - name: Upload Artifact - Linux arm64 + uses: actions/upload-artifact@v2 + if: "!startsWith(github.ref, 'refs/tags/')" + with: + name: ${{ env.APP_NAME }}-dev-${{ env.SHA_SHORT }}-linux-arm64 + path: | + ./dist/default_linux_arm64/${{ env.APP_NAME }} + + - name: Upload Artifact - macOS arm64 + uses: actions/upload-artifact@v2 + if: "!startsWith(github.ref, 'refs/tags/')" + with: + name: ${{ env.APP_NAME }}-dev-${{ env.SHA_SHORT }}-macos-arm64 + path: | + ./dist/default_darwin_arm64/${{ env.APP_NAME }} + + - name: Upload Artifact - Windows amd64 + uses: actions/upload-artifact@v2 + if: "!startsWith(github.ref, 'refs/tags/')" + with: + name: ${{ env.APP_NAME }}-dev-${{ env.SHA_SHORT }}-windows-amd64 + path: | + ./dist/default_windows_amd64/${{ env.APP_NAME }}.exe + - name: Release uses: goreleaser/goreleaser-action@v2 if: startsWith(github.ref, 'refs/tags/') diff --git a/.goreleaser.yml b/.goreleaser.yml index dd1aeda..0de034c 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -47,7 +47,7 @@ archives: - systemd/* snapshot: - name_template: '{{ incpatch .Version }}-dev' + name_template: '{{ incpatch .Version }}-dev-{{.ShortCommit}}' checksum: name_template: "{{ .ProjectName }}_{{ .Version }}_checksums.txt" diff --git a/config/glider.conf.example b/config/glider.conf.example index 519c117..793a9a7 100644 --- a/config/glider.conf.example +++ b/config/glider.conf.example @@ -257,24 +257,33 @@ dnsrecord=www.example.com/2606:2800:220:1:248:1893:25c8:1946 # INTERFACE SPECIFIC # ------------------ -# Specify the outbound ip/interface. +# Specify global outbound ip/interface. # # interface="" # interface="192.168.1.100" # interface="eth0" +# +# Specify interface for a forwarder: +# forward=socks5://192.168.1.10:1080#priority=100&interface=eth0 +# forward=socks5://192.168.1.10:1080#priority=100&interface=192.168.1.100 # RULE FILES # ---------- # Specify additional forward rules. - +# # specify rules folder, so all *.rule files under this folder will be parsed as rule file rules-dir=rules.d - +# # specify a rule file #rulefile=office.rule #rulefile=home.rule - -# INCLUDE MORE CONFIG FILES +# INCLUDE CONFIG FILES +# ---------- #include=dnsrecord.inc.conf #include=more.conf + +# ENVIRONMENT VARIABLES +# ---------- +# use {$ENV_VAR_NAME} in VALUE to get the Environment Variable value. +# forwarder=socks5://{$USER_NAME}:{$USER_PASS}@:1080 \ No newline at end of file diff --git a/go.mod b/go.mod index 639ae01..155ef64 100644 --- a/go.mod +++ b/go.mod @@ -8,17 +8,17 @@ require ( github.com/dgryski/go-idea v0.0.0-20170306091226-d2fb45a411fb github.com/dgryski/go-rc2 v0.0.0-20150621095337-8a9021637152 github.com/insomniacslk/dhcp v0.0.0-20220119180841-3c283ff8b7dd - github.com/nadoo/conflag v0.3.0 + github.com/nadoo/conflag v0.3.1 github.com/nadoo/ipset v0.4.1-0.20220202154244-ddbfbad6db35 github.com/xtaci/kcp-go/v5 v5.6.1 - golang.org/x/crypto v0.0.0-20220208050332-20e1d8d225ab - golang.org/x/sys v0.0.0-20220207234003-57398862261d + golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506 + golang.org/x/sys v0.0.0-20220209214540-3681064d5158 ) require ( github.com/ebfe/rc2 v0.0.0-20131011165748-24b9757f5521 // indirect github.com/klauspost/cpuid/v2 v2.0.11 // indirect - github.com/klauspost/reedsolomon v1.9.15 // indirect + github.com/klauspost/reedsolomon v1.9.16 // indirect github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b // indirect github.com/pkg/errors v0.9.1 // indirect diff --git a/go.sum b/go.sum index bde642d..dc34c82 100644 --- a/go.sum +++ b/go.sum @@ -52,8 +52,8 @@ github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02 github.com/klauspost/cpuid/v2 v2.0.11 h1:i2lw1Pm7Yi/4O6XCSyJWqEHI2MDw2FzUK6o/D21xn2A= github.com/klauspost/cpuid/v2 v2.0.11/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= github.com/klauspost/reedsolomon v1.9.9/go.mod h1:O7yFFHiQwDR6b2t63KPUpccPtNdp5ADgh1gg4fd12wo= -github.com/klauspost/reedsolomon v1.9.15 h1:g2erWKD2M6rgnPf89fCji6jNlhMKMdXcuNHMW1SYCIo= -github.com/klauspost/reedsolomon v1.9.15/go.mod h1:eqPAcE7xar5CIzcdfwydOEdcmchAKAP/qs14y4GCBOk= +github.com/klauspost/reedsolomon v1.9.16 h1:mR0AwphBwqFv/I3B9AHtNKvzuowI1vrj8/3UX4XRmHA= +github.com/klauspost/reedsolomon v1.9.16/go.mod h1:eqPAcE7xar5CIzcdfwydOEdcmchAKAP/qs14y4GCBOk= github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE= github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y= github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= @@ -65,8 +65,8 @@ github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZ github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b h1:MHcTarUMC4sFA7eiyR8IEJ6j2PgmgXR+B9X2IIMjh7A= github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg= github.com/mmcloughlin/avo v0.0.0-20200803215136-443f81d77104/go.mod h1:wqKykBG2QzQDJEzvRkcS8x6MiSJkF52hXZsXcjaB3ls= -github.com/nadoo/conflag v0.3.0 h1:eAnBJYeTKnp8Snq9evyBWme+4rHHTWJFL4nZXajYSPU= -github.com/nadoo/conflag v0.3.0/go.mod h1:dzFfDUpXdr2uS2oV+udpy5N2vfNOu/bFzjhX1WI52co= +github.com/nadoo/conflag v0.3.1 h1:4pHkLIz8PUsfg6ajNYRRSY3bt6m2LPsu6KOzn5uIXQw= +github.com/nadoo/conflag v0.3.1/go.mod h1:dzFfDUpXdr2uS2oV+udpy5N2vfNOu/bFzjhX1WI52co= github.com/nadoo/ipset v0.4.1-0.20220202154244-ddbfbad6db35 h1:ROGpIZqxtrO0mJhSS9bte1VNwVUmmavcjjtw3720t94= github.com/nadoo/ipset v0.4.1-0.20220202154244-ddbfbad6db35/go.mod h1:rYF5DQLRGGoQ8ZSWeK+6eX5amAuPqwFkWjhQlEITGJQ= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -104,8 +104,8 @@ golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20220208050332-20e1d8d225ab h1:lnZ4LoV0UMdibeCUfIB2a4uFwRu491WX/VB2reB8xNc= -golang.org/x/crypto v0.0.0-20220208050332-20e1d8d225ab/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506 h1:EuGTJDfeg/PGZJp3gq1K+14eSLFTsrj1eg8KQuiUyKg= +golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -152,8 +152,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220207234003-57398862261d h1:Bm7BNOQt2Qv7ZqysjeLjgCBanX+88Z/OtdvsrEv1Djc= -golang.org/x/sys v0.0.0-20220207234003-57398862261d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=