diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c4f3145..d8c19d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.13 + - name: Set up Go uses: actions/setup-go@v1 with: go-version: 1.13 @@ -26,7 +26,7 @@ jobs: needs: [test] steps: - - name: Set up Go 1.13 + - name: Set up Go uses: actions/setup-go@v1 with: go-version: 1.13 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93904e5..52368a5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,14 +9,20 @@ jobs: name: Release on GitHub runs-on: ubuntu-latest steps: + + - name: Set up Go + uses: actions/setup-go@v1 + with: + go-version: 1.13 + id: go + - name: Check out code uses: actions/checkout@v1 - name: Create release on GitHub - uses: docker://goreleaser/goreleaser:latest - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + uses: goreleaser/goreleaser-action@v1 with: + version: latest args: release - if: success() - \ No newline at end of file + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.goreleaser.yml b/.goreleaser.yml index 2c0a73e..d2d3661 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -2,10 +2,12 @@ # release: # git tag -a v0.1.0 -m "v0.1.0" -# #git tag -d v0.1.0 # git push origin v0.1.0 # goreleaser release --skip-publish --rm-dist +# #git tag -d v0.1.0 +# #git push origin --delete tag v0.1.0 + # snapshot: # goreleaser --snapshot --rm-dist diff --git a/go.mod b/go.mod index 567b0ab..03218ea 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae // indirect golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582 // indirect - golang.org/x/sys v0.0.0-20191018095205-727590c5006e // indirect + golang.org/x/sys v0.0.0-20191020212454-3e7259c5e7c2 // indirect ) // Replace dependency modules with local developing copy diff --git a/go.sum b/go.sum index 0e4d449..1af70dc 100644 --- a/go.sum +++ b/go.sum @@ -44,6 +44,6 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191009170203-06d7bd2c5f4f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191018095205-727590c5006e h1:ZtoklVMHQy6BFRHkbG6JzK+S6rX82//Yeok1vMlizfQ= -golang.org/x/sys v0.0.0-20191018095205-727590c5006e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191020212454-3e7259c5e7c2 h1:nq114VpM8lsSlP+lyUbANecYHYiFcSNFtqcBlxRV+gA= +golang.org/x/sys v0.0.0-20191020212454-3e7259c5e7c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/main.go b/main.go index 50a9af2..77d932b 100644 --- a/main.go +++ b/main.go @@ -30,7 +30,7 @@ import ( _ "github.com/nadoo/glider/proxy/ws" ) -var version = "0.9.0" +var version = "0.9.1" func main() { // read configs diff --git a/proxy/http/server.go b/proxy/http/server.go index 98bec17..b91bb7b 100644 --- a/proxy/http/server.go +++ b/proxy/http/server.go @@ -93,6 +93,7 @@ func (s *HTTP) servHTTPS(r *request, c net.Conn) { log.F("[http] %s <-> %s [c] via %s, error in dial: %v", c.RemoteAddr(), r.uri, p, err) return } + defer rc.Close() c.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))