diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2020-10-23 16:24:13 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2020-10-23 16:24:13 +0300 |
| commit | 87c6dd81c833e93e68fa5bd0479c06351aff12b0 (patch) | |
| tree | b779c586a6955ae5bb99cf52a8a35daf88189403 /Makefile | |
| parent | 2c750a230dae024d4f59a85c7dba66bac5546fe6 (diff) | |
| parent | b2fc0f7fd3f09e7d5624575fd4a01ef4702a060e (diff) | |
Merge branch 'zj-remove-gitlab-shell' into 'master'
gitlab-shell: Remove vendored files
See merge request gitlab-org/gitaly!2618
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 5 insertions, 13 deletions
@@ -22,7 +22,6 @@ SOURCE_DIR := $(abspath $(dir $(lastword ${MAKEFILE_LIST}))) BUILD_DIR := ${SOURCE_DIR}/_build COVERAGE_DIR := ${BUILD_DIR}/cover GITALY_RUBY_DIR := ${SOURCE_DIR}/ruby -GITLAB_SHELL_DIR := ${GITALY_RUBY_DIR}/gitlab-shell # These variables may be overridden at runtime by top-level make PREFIX ?= /usr/local @@ -188,10 +187,10 @@ assemble-go: build .PHONY: assemble-ruby assemble-ruby: ${Q}mkdir -p ${ASSEMBLY_ROOT} - ${Q}rm -rf ${GITALY_RUBY_DIR}/tmp ${GITLAB_SHELL_DIR}/tmp + ${Q}rm -rf ${GITALY_RUBY_DIR}/tmp ${Q}mkdir -p ${ASSEMBLY_ROOT}/ruby/ rsync -a --delete ${GITALY_RUBY_DIR}/ ${ASSEMBLY_ROOT}/ruby/ - ${Q}rm -rf ${ASSEMBLY_ROOT}/ruby/spec ${ASSEMBLY_ROOT}/ruby/gitlab-shell/spec ${ASSEMBLY_ROOT}/ruby/gitlab-shell/gitlab-shell.log + ${Q}rm -rf ${ASSEMBLY_ROOT}/ruby/spec .PHONY: binaries binaries: assemble @@ -199,11 +198,11 @@ binaries: assemble ${Q}cd ${ASSEMBLY_ROOT} && sha256sum bin/* | tee checksums.sha256.txt .PHONY: prepare-tests -prepare-tests: git ${GITLAB_SHELL_DIR}/config.yml ${TEST_REPO} ${TEST_REPO_GIT} ${SOURCE_DIR}/.ruby-bundle +prepare-tests: git ${TEST_REPO} ${TEST_REPO_GIT} ${SOURCE_DIR}/.ruby-bundle .PHONY: test test: export PATH := ${SOURCE_DIR}/internal/testhelper/testdata/home/bin:${PATH} -test: test-go rspec rspec-gitlab-shell +test: test-go rspec .PHONY: test-go test-go: prepare-tests ${GO_JUNIT_REPORT} libgit2 @@ -229,10 +228,6 @@ race-go: test-go rspec: assemble-go prepare-tests ${Q}cd ${GITALY_RUBY_DIR} && bundle exec rspec -.PHONY: rspec-gitlab-shell -rspec-gitlab-shell: ${GITLAB_SHELL_DIR}/config.yml assemble-go prepare-tests - ${Q}cd ${GITALY_RUBY_DIR} && bundle exec bin/ruby-cd ${GITLAB_SHELL_DIR} rspec - .PHONY: test-postgres test-postgres: prepare-tests ${Q}go test -tags "${GO_BUILD_TAGS}",postgres -count=1 gitlab.com/gitlab-org/gitaly/internal/praefect/... @@ -277,7 +272,7 @@ notice: ${SOURCE_DIR}/NOTICE .PHONY: clean clean: - rm -rf ${BUILD_DIR} ${SOURCE_DIR}/internal/testhelper/testdata/data/ ${SOURCE_DIR}/ruby/.bundle/ ${SOURCE_DIR}/ruby/gitlab-shell/config.yml ${SOURCE_DIR}/ruby/vendor/bundle/ $(addprefix ${SOURCE_DIR}/, $(notdir $(call find_commands))) + rm -rf ${BUILD_DIR} ${SOURCE_DIR}/internal/testhelper/testdata/data/ ${SOURCE_DIR}/ruby/.bundle/ ${SOURCE_DIR}/ruby/vendor/bundle/ $(addprefix ${SOURCE_DIR}/, $(notdir $(call find_commands))) .PHONY: clean-ruby-vendor-go clean-ruby-vendor-go: @@ -461,6 +456,3 @@ ${TEST_REPO_GIT}: mkdir -p $@/refs/heads $@/refs/tags cp ${SOURCE_DIR}/_support/gitlab-git-test.git-packed-refs $@/packed-refs ${GIT} -C $@ fsck --no-progress - -${GITLAB_SHELL_DIR}/config.yml: ${GITLAB_SHELL_DIR}/config.yml.example - cp $< $@ |