From 85cd479e068128ee375f9e66915f8aecc847ccb4 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 22 Oct 2018 10:52:44 -0700 Subject: [PATCH] add CI step to check for gx-rewritten paths License: MIT Signed-off-by: Steven Allen --- bin/test-gx-imports | 13 +++++++++++++ ci/Jenkinsfile | 7 +++++++ mk/gx.mk | 3 +++ 3 files changed, 23 insertions(+) create mode 100755 bin/test-gx-imports diff --git a/bin/test-gx-imports b/bin/test-gx-imports new file mode 100755 index 00000000000..43c44c749e5 --- /dev/null +++ b/bin/test-gx-imports @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +set -euo pipefail +T="$(mktemp)" +if go list -f '{{ join .Deps "\n" }}' ./... | grep '^gx/ipfs/' >"$T"; then + echo "Go-ipfs has the following gx-imports" + echo "-----------------------------------" + cat "$T" + echo "-----------------------------------" + echo "Run 'gx-go rw --fix' in your source directory" + rm -f "$T" + exit 1 +fi +rm -f "$T" diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index 59ae86a8b2f..e34983b6450 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -128,6 +128,13 @@ ansiColor('xterm') { withEnv(['TERM=xterm-color']) { run 'test -z "$(./bin/gx deps dupes)"' } } + }, + 'check for gx paths': { + setupStep('linux') { run -> + timeout(time: check_timeout, unit: 'MINUTES') { + run 'make test_gx_imports' + } + } } ) } diff --git a/mk/gx.mk b/mk/gx.mk index 6371333ea7e..f4cdf504e65 100644 --- a/mk/gx.mk +++ b/mk/gx.mk @@ -17,6 +17,9 @@ gx-deps: bin/gx bin/gx-go endif .PHONY: gx-deps +test_gx_imports: + bin/test-gx-imports + ifeq ($(tarball-is),0) DEPS_GO += gx-deps endif