summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2023-02-08 08:54:01 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2023-02-08 08:54:01 +0000
commit874ecd58af03542d0acdbf0ba0da856cf2ad638e (patch)
treea6bb736876a833b36736084c1356d4b692f3982e
parent336c4a51aa332b0cc1c68798003a1d82ab4a9cc3 (diff)
parentc7c52ac4db7fd21d613b7d359649ef4a58f63718 (diff)
downloadgitlab-shell-874ecd58af03542d0acdbf0ba0da856cf2ad638e.tar.gz
Merge branch 'sh-add-gitlab-sshd-makefile' into 'main'
Add bin/gitlab-sshd as an explicit Makefile target See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/714 Merged-by: Ash McKenzie <amckenzie@gitlab.com> Approved-by: Ash McKenzie <amckenzie@gitlab.com> Co-authored-by: Stan Hu <stanhu@gmail.com>
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 290a783..51db004 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ GOBUILD_FLAGS := -ldflags "-X main.Version=$(VERSION_STRING) -X main.BuildTime=$
PREFIX ?= /usr/local
-build: bin/gitlab-shell
+build: compile
validate: verify test
@@ -58,10 +58,13 @@ setup: _script_install bin/gitlab-shell
_script_install:
bin/install
-compile: bin/gitlab-shell
+compile: bin/gitlab-shell bin/gitlab-sshd
bin/gitlab-shell: $(GO_SOURCES)
GOBIN="$(CURDIR)/bin" go install $(GOBUILD_FLAGS) ./cmd/...
+bin/gitlab-sshd: $(GO_SOURCES)
+ GOBIN="$(CURDIR)/bin" go install $(GOBUILD_FLAGS) ./cmd/gitlab-sshd
+
check:
bin/check