diff options
| author | Toon Claes <toon@gitlab.com> | 2020-11-23 16:46:42 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2020-11-23 16:46:42 +0300 |
| commit | 3c2a0a460ffade9ec85735d1b714cbc142b86f38 (patch) | |
| tree | cf4f50689354cb9b2c3b9ebe803ae8f3af5627e1 | |
| parent | 7dcaf04a54867d2878cb5921a22a9af4d3ada04e (diff) | |
| parent | 222d466b4f2c3daf06704a9e12a7607047da7cd6 (diff) | |
Merge branch 'pks-makefile-protodiff' into 'master'
Makefile: Don't write proto.diff into source directory
See merge request gitlab-org/gitaly!2823
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | Makefile | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 7c6b00486..008e00c4c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ # Generic artifacts /_build /*.deb -/proto.diff # Ruby build artifacts /.ruby-bundle diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d1ae8d83b..d48fd12b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,9 +104,9 @@ proto: - make proto no-changes artifacts: paths: + - _build/proto.diff - ruby/proto/gitaly/* - proto/go/gitalypb/* - - proto.diff when: on_failure build: @@ -331,9 +331,9 @@ no-changes: ${Q}${GIT} status --porcelain | awk '{ print } END { if (NR > 0) { exit 1 } }' .PHONY: no-proto-changes -no-proto-changes: - ${Q}${GIT} diff -- '*.pb.go' 'ruby/proto/gitaly' >proto.diff - ${Q}if [ -s proto.diff ]; then echo "There is a difference in generated proto files. Please take a look at proto.diff file." && exit 1; fi +no-proto-changes: | ${BUILD_DIR} + ${Q}${GIT} diff -- '*.pb.go' 'ruby/proto/gitaly' >${BUILD_DIR}/proto.diff + ${Q}if [ -s ${BUILD_DIR}/proto.diff ]; then echo "There is a difference in generated proto files. Please take a look at ${BUILD_DIR}/proto.diff file." && exit 1; fi .PHONY: smoke-test smoke-test: all rspec |