Merge pull request #98 from cdr/fix-coder-cli-test-binary

cmoog · web-flow · commit ddaeba7e823c · 2020-08-22T13:51:10.000-05:00
Use release binary in integration tests
diff --git 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
@@ -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
