From 318e09ee655fa88c486b1867f59eea264bf5d112 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Fri, 21 Aug 2020 09:51:53 -0500 Subject: [PATCH] Use release binary for integration test --- ci/integration/setup_test.go | 7 +++++-- ci/steps/build.sh | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/integration/setup_test.go b/ci/integration/setup_test.go index 625faa5c..aecd7ed9 100644 --- a/ci/integration/setup_test.go +++ b/ci/integration/setup_test.go @@ -32,11 +32,14 @@ func init() { // build the coder-cli binary and move to the integration testing bin directory func build(path string) error { + tar := fmt.Sprintf("coder-cli-linux-amd64.tar.gz") + dir := filepath.Dir(path) cmd := exec.Command( "sh", "-c", - fmt.Sprintf("cd ../../ && go build -o %s ./cmd/coder", path), + fmt.Sprintf( + "cd ../../ && mkdir -p %s && ./ci/steps/build.sh && cp ./ci/bin/%s %s/ && tar -xzf %s -C %s", + dir, tar, dir, filepath.Join(dir, tar), dir), ) - cmd.Env = append(os.Environ(), "GOOS=linux", "CGO_ENABLED=0") out, err := cmd.CombinedOutput() if err != nil { diff --git a/ci/steps/build.sh b/ci/steps/build.sh index c29e87ee..b5b42e44 100755 --- a/ci/steps/build.sh +++ b/ci/steps/build.sh @@ -10,8 +10,6 @@ cd "$(dirname "$0")" export GOARCH=amd64 tag=$(git describe --tags) -mkdir -p bin - build(){ tmpdir=$(mktemp -d) go build -ldflags "-X main.version=${tag}" -o "$tmpdir/coder" ../../cmd/coder