Pick the GoReleaser build for integration tests by default

.gitignore

@@ -4,9 +4,6 @@ php-*
 !internal/legacy/archives/windows_php.ini.tpl
 completion
 
-# Executable built with `go build ./cmd/platform` (or `make platform`)
-/platform
-
 # Binaries for programs and plugins
 *.exe
 *.exe~

Makefile

@@ -86,12 +86,9 @@ test: ## Run unit tests
 	go clean -testcache
 	go test -v -race -short -cover ./...
 
-platform: internal/legacy/archives/platform.phar php
-	go build ./cmd/platform
-
 .PHONY: integration-test
-integration-test: platform
-	TEST_CLI_PATH="$(PWD)/platform" go test -v ./tests/...
+integration-test: single
+	go test -v ./tests/...
 
 golangci-lint:
 	command -v golangci-lint >/dev/null || go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)

tests/tests.go

@@ -23,26 +23,25 @@ var _validatedCommand string
 const mockProjectID = "abcdefg123456"
 
 func getCommandName(t *testing.T) string {
+	if testing.Short() {
+		t.Skip("skipping integration test due to -short flag")
+	}
 	if _validatedCommand != "" {
 		return _validatedCommand
 	}
 	candidate := os.Getenv("TEST_CLI_PATH")
-	if candidate == "" {
-		candidate = "platform"
-	}
-	if !filepath.IsAbs(candidate) {
-		c, err := filepath.Abs("../" + candidate)
+	if candidate != "" {
+		_, err := os.Stat(candidate)
 		require.NoError(t, err)
-		candidate = c
-	}
-	_, err := os.Stat(candidate)
-	switch {
-	case os.IsNotExist(err) && os.Getenv("TEST_CLI_PATH") == "":
-		t.Skipf("skipping integration tests: CLI not found at path: %s", candidate)
-	case err != nil:
+	} else {
+		matches, _ := filepath.Glob("../dist/platform_*/platform")
+		if len(matches) == 0 {
+			t.Skipf("skipping integration tests: CLI not found matching path: %s", "../dist/platform_*/platform")
+			return ""
+		}
+		c, err := filepath.Abs(matches[0])
 		require.NoError(t, err)
-	case testing.Short():
-		t.Skip("skipping integration test due to -short flag")
+		candidate = c
 	}
 	versionCmd := exec.Command(candidate, "--version")
 	versionCmd.Env = testEnv()