From 98808a193d468c1b60706055b7396bd26df1658d Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Fri, 28 Jun 2019 18:13:04 -0500 Subject: [PATCH] Gzip releases --- autocomplete.go | 1 + chrome.go | 5 +++-- ci/build.sh | 6 +++--- codeserver.go | 3 ++- config.go | 1 + editcmd.go | 2 +- globalflags.go | 1 + hat_builder.go | 3 ++- internal/browserapp/open.go | 1 + internal/codeserver/proc.go | 3 ++- internal/hat/hat.go | 3 ++- lscmd.go | 3 ++- project.go | 9 ++++----- proxycmd.go | 5 +++-- 14 files changed, 28 insertions(+), 18 deletions(-) diff --git a/autocomplete.go b/autocomplete.go index 7b8ca36..f6deaaf 100644 --- a/autocomplete.go +++ b/autocomplete.go @@ -6,6 +6,7 @@ import ( "unicode/utf8" "github.com/posener/complete" + "go.coder.com/cli" ) diff --git a/chrome.go b/chrome.go index cbfd58b..e2db18f 100644 --- a/chrome.go +++ b/chrome.go @@ -15,11 +15,12 @@ import ( "time" "unsafe" - "go.coder.com/cli" - "go.coder.com/flog" "golang.org/x/xerrors" "nhooyr.io/websocket" "nhooyr.io/websocket/wsjson" + + "go.coder.com/cli" + "go.coder.com/flog" ) func runNativeMsgHost() { diff --git a/ci/build.sh b/ci/build.sh index 980e3e1..f5ff175 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -10,12 +10,12 @@ build(){ go build -ldflags "-X main.version=${tag}" -o $tmpdir/sail pushd $tmpdir - tarname=sail-$GOOS-$GOARCH.tar - tar -cf $tarname sail + tarname=sail-$GOOS-$GOARCH.tar.gz + tar -czf $tarname sail popd cp $tmpdir/$tarname bin rm -rf $tmpdir } GOOS=darwin build -GOOS=linux build \ No newline at end of file +GOOS=linux build diff --git a/codeserver.go b/codeserver.go index abea6fe..0a99847 100644 --- a/codeserver.go +++ b/codeserver.go @@ -14,9 +14,10 @@ import ( "strings" "time" + "golang.org/x/xerrors" + "go.coder.com/flog" "go.coder.com/sail/internal/codeserver" - "golang.org/x/xerrors" ) // loadCodeServer produces a path containing the code-server binary. diff --git a/config.go b/config.go index 3aaea3c..649c259 100644 --- a/config.go +++ b/config.go @@ -7,6 +7,7 @@ import ( "strings" "github.com/BurntSushi/toml" + "go.coder.com/flog" ) diff --git a/editcmd.go b/editcmd.go index 10a5204..1e05f39 100644 --- a/editcmd.go +++ b/editcmd.go @@ -9,6 +9,7 @@ import ( "time" "github.com/docker/docker/api/types" + "golang.org/x/xerrors" "go.coder.com/cli" "go.coder.com/flog" @@ -16,7 +17,6 @@ import ( "go.coder.com/sail/internal/editor" "go.coder.com/sail/internal/randstr" "go.coder.com/sail/internal/xexec" - "golang.org/x/xerrors" ) type editcmd struct { diff --git a/globalflags.go b/globalflags.go index d97e5ab..e870976 100644 --- a/globalflags.go +++ b/globalflags.go @@ -5,6 +5,7 @@ import ( "os/exec" "github.com/fatih/color" + "go.coder.com/flog" ) diff --git a/hat_builder.go b/hat_builder.go index 8075006..b431532 100644 --- a/hat_builder.go +++ b/hat_builder.go @@ -10,10 +10,11 @@ import ( "strings" "github.com/docker/docker/client" + "golang.org/x/xerrors" + "go.coder.com/flog" "go.coder.com/sail/internal/hat" "go.coder.com/sail/internal/xexec" - "golang.org/x/xerrors" ) // hatBuilder is responsible for applying a hat to a base image. diff --git a/internal/browserapp/open.go b/internal/browserapp/open.go index 8d19788..1ff35a5 100644 --- a/internal/browserapp/open.go +++ b/internal/browserapp/open.go @@ -7,6 +7,7 @@ import ( "os/exec" "github.com/pkg/browser" + "go.coder.com/sail/internal/nohup" ) diff --git a/internal/codeserver/proc.go b/internal/codeserver/proc.go index 022433e..8ff5166 100644 --- a/internal/codeserver/proc.go +++ b/internal/codeserver/proc.go @@ -4,8 +4,9 @@ import ( "strconv" "strings" - "go.coder.com/sail/internal/dockutil" "golang.org/x/xerrors" + + "go.coder.com/sail/internal/dockutil" ) var ( diff --git a/internal/hat/hat.go b/internal/hat/hat.go index 05c6db7..5f0a8de 100644 --- a/internal/hat/hat.go +++ b/internal/hat/hat.go @@ -5,8 +5,9 @@ import ( "bytes" "io/ioutil" - "go.coder.com/sail/internal/xexec" "golang.org/x/xerrors" + + "go.coder.com/sail/internal/xexec" ) // DockerReplaceFrom replaces the FROM clause in a Dockerfile diff --git a/lscmd.go b/lscmd.go index 50d7137..d2dc70c 100644 --- a/lscmd.go +++ b/lscmd.go @@ -10,9 +10,10 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" + "golang.org/x/xerrors" + "go.coder.com/cli" "go.coder.com/flog" - "golang.org/x/xerrors" ) type lscmd struct { diff --git a/project.go b/project.go index e9ddb47..905fff7 100644 --- a/project.go +++ b/project.go @@ -8,15 +8,14 @@ import ( "strings" "time" - "go.coder.com/sail/internal/dockutil" + "github.com/docker/docker/api/types" + "golang.org/x/xerrors" + "go.coder.com/flog" "go.coder.com/sail/internal/browserapp" "go.coder.com/sail/internal/codeserver" - - "github.com/docker/docker/api/types" - "go.coder.com/flog" + "go.coder.com/sail/internal/dockutil" "go.coder.com/sail/internal/xexec" - "golang.org/x/xerrors" ) type projectStatus string diff --git a/proxycmd.go b/proxycmd.go index 681c906..02ed3d7 100644 --- a/proxycmd.go +++ b/proxycmd.go @@ -12,15 +12,16 @@ import ( "net/http" "net/http/httputil" "net/url" - "nhooyr.io/websocket" "strconv" "sync" "sync/atomic" "time" + "golang.org/x/xerrors" + "nhooyr.io/websocket" + "go.coder.com/cli" "go.coder.com/flog" - "golang.org/x/xerrors" ) func codeServerProxy(w http.ResponseWriter, r *http.Request, port string) {