Skip to content

Commit 3d156ed

Browse files
stanhuashmckenzie
authored and
GitLab
committed
Merge branch 'ashmckenzie/bin-install-shuffle' into 'main'
Add 'make make_necessary_dirs' alias See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/1119 Merged-by: Stan Hu <[email protected]> Approved-by: Javiera Tapia <[email protected]> Approved-by: Stan Hu <[email protected]> Co-authored-by: Ash McKenzie <[email protected]>
2 parents e43ad6c + bc18134 commit 3d156ed

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
@@ -1,4 +1,4 @@
1-
.PHONY: validate verify verify_ruby verify_golang test test_ruby test_golang test_fancy test_golang_fancy coverage coverage_golang setup _script_install build compile check clean install lint
1+
.PHONY: validate verify verify_ruby verify_golang test test_ruby test_golang test_fancy test_golang_fancy coverage coverage_golang setup _script_install make_necessary_dirs build compile check clean install lint
22

33
FIPS_MODE ?= 0
44
OS := $(shell uname | tr A-Z a-z)
@@ -94,8 +94,9 @@ ${GOLANGCI_LINT_FILE}:
9494
mkdir -p $(shell dirname ${GOLANGCI_LINT_FILE})
9595
curl -L https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_LINT_VERSION}/golangci-lint-${GOLANGCI_LINT_VERSION}-${OS}-${ARCH}.tar.gz | tar --strip-components 1 -zOxf - golangci-lint-${GOLANGCI_LINT_VERSION}-${OS}-${ARCH}/golangci-lint > ${GOLANGCI_LINT_FILE} && chmod +x ${GOLANGCI_LINT_FILE}
9696

97-
setup: _script_install bin/gitlab-shell
97+
setup: make_necessary_dirs bin/gitlab-shell
9898

99+
make_necessary_dirs: _script_install
99100
_script_install:
100101
bin/install
101102

0 commit comments

Comments
 (0)