From 0660f5b7a44ed12be8365bbca1f0e0018d742bb9 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 14 Sep 2022 14:39:19 -0400 Subject: Cirrus: Combine build and code consistency tasks It's conceivable for CI to spend a lot of time testing code which otherwise should be rejected due to quality problems. Previously this was validated in a dedicated task, however a failure would still fail the CI run. Simplify the number of CI tasks by combining the consistency check at the tail-end of the build task. Signed-off-by: Chris Evich --- contrib/cirrus/check_go_changes.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'contrib/cirrus/check_go_changes.sh') diff --git a/contrib/cirrus/check_go_changes.sh b/contrib/cirrus/check_go_changes.sh index 3c35ce51a..a92ab03af 100755 --- a/contrib/cirrus/check_go_changes.sh +++ b/contrib/cirrus/check_go_changes.sh @@ -36,6 +36,8 @@ then exit 0 fi +# Defined by/in Cirrus-CI config. +# shellcheck disable=SC2154 base=$(git merge-base $DEST_BRANCH $CIRRUS_CHANGE_IN_REPO) diffs=$(git diff $base $CIRRUS_CHANGE_IN_REPO -- '*.go' ':^vendor/') -- cgit v1.2.3-54-g00ecf