mirror of https://github.com/containers/conmon.git
Remove hack/tree_status.sh
The sole reason of having this was to produce a nice informative error message in case of failure (and because the message was not explicitly specified, it was entirely wrong in 1 of 2 use cases). Let's drop it and just use git to fail the job if a tree is dirty. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
parent
0a5e93d95b
commit
c85e7bb4ed
|
|
@ -87,7 +87,7 @@ config_task:
|
||||||
- dnf install -y make glib2-devel git gcc golang
|
- dnf install -y make glib2-devel git gcc golang
|
||||||
- cd $CIRRUS_WORKING_DIR
|
- cd $CIRRUS_WORKING_DIR
|
||||||
- make config
|
- make config
|
||||||
- ./hack/tree_status.sh
|
- git diff --exit-code
|
||||||
|
|
||||||
|
|
||||||
# Verify code was fmt'ed properly
|
# Verify code was fmt'ed properly
|
||||||
|
|
@ -102,7 +102,7 @@ fmt_task:
|
||||||
- dnf install -y clang clang-tools-extra golang
|
- dnf install -y clang clang-tools-extra golang
|
||||||
- cd $CIRRUS_WORKING_DIR
|
- cd $CIRRUS_WORKING_DIR
|
||||||
- make fmt
|
- make fmt
|
||||||
- ./hack/tree_status.sh
|
- git diff --exit-code
|
||||||
|
|
||||||
|
|
||||||
# Build the static binary
|
# Build the static binary
|
||||||
|
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
# this script is based off of the similarly named in github.com/containers/libpod/hack/tree_status.sh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
SUGGESTION="${SUGGESTION:-call 'make config' and commit all changes.}"
|
|
||||||
|
|
||||||
STATUS=$(git status --porcelain)
|
|
||||||
if [[ -z $STATUS ]]
|
|
||||||
then
|
|
||||||
echo "tree is clean"
|
|
||||||
else
|
|
||||||
echo "tree is dirty, please $SUGGESTION"
|
|
||||||
echo ""
|
|
||||||
echo "$STATUS"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
Loading…
Reference in New Issue