Skip to content

Commit df6ff94

Browse files
Igor Drozdovashmckenzie
authored and
GitLab
committed
Merge branch 'ashmckenzie/improve-binary-building' into 'main'
Use go build so we can use -o See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/1117 Merged-by: Igor Drozdov <[email protected]> Approved-by: Jaime Martinez <[email protected]> Approved-by: Igor Drozdov <[email protected]> Co-authored-by: Ash McKenzie <[email protected]>
2 parents 3d156ed + 90418d8 commit df6ff94

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,12 @@ _script_install:
101101
bin/install
102102

103103
compile: bin/gitlab-shell bin/gitlab-sshd
104+
104105
bin/gitlab-shell: $(GO_SOURCES)
105-
GOBIN="$(CURDIR)/bin" go install $(GOBUILD_FLAGS) ./cmd/...
106+
go build $(GOBUILD_FLAGS) -o $(CURDIR)/bin ./cmd/...
106107

107108
bin/gitlab-sshd: $(GO_SOURCES)
108-
GOBIN="$(CURDIR)/bin" go install $(GOBUILD_FLAGS) ./cmd/gitlab-sshd
109+
go build $(GOBUILD_FLAGS) -o $(CURDIR)/bin/gitlab-sshd ./cmd/gitlab-sshd
109110

110111
check:
111112
bin/check

0 commit comments

Comments
 (0)