File tree Expand file tree Collapse file tree 2 files changed +13
-7
lines changed Expand file tree Collapse file tree 2 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -64,3 +64,4 @@ test/integration/testdata/minikube-linux-amd64-latest-stable
64
64
hack /legacy_fill_db /gopogh_filldb_log.txt
65
65
hack /legacy_fill_db /out /output_summary.json
66
66
hack /legacy_fill_db /out /output.html
67
+ hack /go-licenses
Original file line number Diff line number Diff line change @@ -77,15 +77,20 @@ env BUILD_IN_DOCKER=y \
77
77
" out/docker-machine-driver-kvm2-${RPM_VERSION} -${RPM_REVISION} .x86_64.rpm"
78
78
79
79
# check if 'commit: <commit-id>' line contains '-dirty' commit suffix
80
- BUILT_VERSION=$( " out/minikube-$( go env GOOS) -$( go env GOARCH) " version)
81
- echo ${BUILT_VERSION}
82
-
83
- COMMIT=$( echo ${BUILT_VERSION} | grep ' commit:' | awk ' {print $2}' )
84
- if (echo ${COMMIT} | grep -q dirty); then
85
- echo " 'minikube version' reports dirty commit: ${COMMIT} "
80
+ BUILT_VERSION=" $( out/minikube-$( go env GOOS) -$( go env GOARCH) version) "
81
+ echo " $BUILT_VERSION "
82
+ # Extract commit hash from the correct line
83
+ COMMIT=$( echo " $BUILT_VERSION " | grep ' ^commit:' | awk ' {print $2}' )
84
+
85
+ if echo " $COMMIT " | grep -q dirty; then
86
+ echo " 'minikube version' reports dirty commit: $COMMIT "
87
+ echo " ------------------------------------------------------------------------"
88
+ echo " The following uncommitted changes are causing the build to be dirty:"
89
+ git status --porcelain
90
+ echo " ------------------------------------------------------------------------"
91
+ echo " To fix this, commit or stash the above changes."
86
92
exit 1
87
93
fi
88
-
89
94
# Don't upload temporary copies, avoid unused duplicate files in the release storage
90
95
rm -f out/minikube-linux-x86_64
91
96
rm -f out/minikube-linux-i686
You can’t perform that action at this time.
0 commit comments