diff --git a/.gitignore b/.gitignore index 88395b5..9b509e2 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ go.work go.work.sum -# Local ReleaseKit executable and delivery credentials +# Local ReleaseKit delivery credentials .releasekit/ # env file diff --git a/scripts/releasekit.sh b/scripts/releasekit.sh index bc0f235..88a3202 100755 --- a/scripts/releasekit.sh +++ b/scripts/releasekit.sh @@ -11,8 +11,4 @@ GOOS=$(go env GOHOSTOS) GOARCH=$(go env GOHOSTARCH) export GOOS GOARCH -mkdir -p .releasekit/bin -go build -mod=readonly -o .releasekit/bin/releasekit \ - "go.maximumdirect.net/releasekit/cmd/releasekit" - -exec ./.releasekit/bin/releasekit "$@" +exec go tool go.maximumdirect.net/releasekit/cmd/releasekit "$@" diff --git a/scripts/test-release.py b/scripts/test-release.py index 8e60f80..428e4a6 100644 --- a/scripts/test-release.py +++ b/scripts/test-release.py @@ -106,10 +106,11 @@ def verify_bootstrap(repository, root, environment, selected_go): version = run([launcher, "version"], root, environment).strip() if version != f"releasekit {selected_version}": raise RuntimeError(f"launcher used an unexpected tool: {version}") - build_info = run( - ["go", "version", "-m", str(repository / ".releasekit/bin/releasekit")], - root, environment, - ) + tool_path = run( + ["go", "tool", "-n", f"{RELEASEKIT_MODULE}/cmd/releasekit"], + repository, environment, + ).strip() + build_info = run(["go", "version", "-m", tool_path], root, environment) if selected_go not in build_info.splitlines()[0]: raise RuntimeError("launcher did not build with the selected local Go") if f"\tmod\t{RELEASEKIT_MODULE}\t{selected_version}\t" not in build_info: