Check for dirty git

rancher · May 14, 2019 · 1589ad1 · 1589ad1
1 parent dde4459
commit 1589ad1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -18,6 +18,6 @@ trash-keep: .dapper
 
 deps: trash
 
-.DEFAULT_GOAL := ci
+.DEFAULT_GOAL := default
 
 .PHONY: $(TARGETS)
diff --git a/scripts/ci b/scripts/ci
@@ -6,4 +6,5 @@ cd $(dirname $0)
 ./build
 ./test
 ./validate
+./validate-ci
 ./package
diff --git a/scripts/default b/scripts/default
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+cd $(dirname $0)
+
+./build
+./test
+./validate
+./package
diff --git a/scripts/validate b/scripts/validate
@@ -19,6 +19,3 @@ golangci-lint run
 
 echo Running: go fmt
 test -z "$(go fmt ${PACKAGES} | tee /dev/stderr)"
-
-echo Running: go mod verify
-go mod verify
diff --git a/scripts/validate-ci b/scripts/validate-ci
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+cd $(dirname $0)/..
+
+go generate
+
+source ./scripts/version
+
+if [ -n "$DIRTY" ]; then
+    echo Git is dirty
+    git status
+    git diff
+    exit 1
+fi