diff options
| author | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-01-15 23:45:08 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-01-15 23:45:08 +0300 |
| commit | 050ad6bd1d08cffc7d4bf63ff1362c5c935dc640 (patch) | |
| tree | 161a1f4cb9d334bdee506b736ef1d3ac5d8c3b7c | |
| parent | e5bd31fcb930fcf7fc822c3f72c9cfab597776ae (diff) | |
| parent | ad9c544ace62996d2648db29039c20a62339fd58 (diff) | |
Merge branch 'test-ignore-ruby-vendor' into 'master'
Skip the ruby-folder for Go tests
See merge request gitlab-org/gitaly!536
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -25,7 +25,7 @@ export GOPATH := $(TARGET_DIR) export PATH := $(GOPATH)/bin:$(PATH) # Returns a list of all non-vendored (local packages) -LOCAL_PACKAGES = $(shell cd "$(PKG_BUILD_DIR)" && GOPATH=$(GOPATH) go list ./... | grep -v '^$(PKG)/vendor/') +LOCAL_PACKAGES = $(shell cd "$(PKG_BUILD_DIR)" && GOPATH=$(GOPATH) go list ./... | grep -v '^$(PKG)/vendor/' | grep -v '^$(PKG)/ruby/') LOCAL_GO_FILES = $(shell find -L $(PKG_BUILD_DIR) -name "*.go" -not -path "$(PKG_BUILD_DIR)/vendor/*" -not -path "$(PKG_BUILD_DIR)/_build/*") CHANGED_LOCAL_GO_FILES = $(shell git status --porcelain --short | awk '{ print $$2 }' | grep -v '^$(PKG)/vendor/' | grep .go$) CHANGED_LOCAL_GO_PACKAGES = $(foreach file,$(CHANGED_LOCAL_GO_FILES),./$(dir $(file))/...) |