summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-07-01 10:25:58 +0000
committerNick Thomas <nick@gitlab.com>2019-07-01 10:25:58 +0000
commit5b8e04fbc8ff4ca866dea4c97c881db7e8b087bb (patch)
tree155628ef83e90370695a6b245e2d765e4237c603
parent7b23c6f01c06de45e97f49ab0557e551a6c1edf0 (diff)
parent1933630419b77e6b046ae72baf0bd96c6c369f24 (diff)
downloadgitlab-shell-5b8e04fbc8ff4ca866dea4c97c881db7e8b087bb.tar.gz
Merge branch '198-update-phony-to-have-accurate-list-of-targets' into 'master'
Resolve "Update .PHONY to have accurate list of targets" Closes #198 See merge request gitlab-org/gitlab-shell!316
-rw-r--r--Makefile12
-rwxr-xr-xbin/check2
2 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index e9a81b2..84cba6b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: test test_ruby test_ruby_rubocop test_ruby_rspec test_go test_go_format test_go_test
+.PHONY: validate verify verify_ruby verify_golang test test_ruby test_golang setup _install build compile check clean
validate: verify test
@@ -22,10 +22,14 @@ test_ruby:
test_golang:
support/go-test
-setup: compile
-build: compile
-compile:
+setup: _install bin/gitlab-shell
+
+_install:
bin/install
+
+build: bin/gitlab-shell
+compile: bin/gitlab-shell
+bin/gitlab-shell:
bin/compile
check:
diff --git a/bin/check b/bin/check
index d2224a6..2acee63 100755
--- a/bin/check
+++ b/bin/check
@@ -33,7 +33,7 @@ config = GitlabConfig.new
abort("ERROR: missing option in config.yml") unless config.auth_file
-print "\nAccess to #{config.auth_file}: "
+print "Access to #{config.auth_file}: "
if system(File.dirname(__FILE__) + '/gitlab-keys', 'check-permissions')
print 'OK'
else