diff --git a/hack/validate/changelog-date-descending b/hack/validate/changelog-date-descending deleted file mode 100755 index 301f9ba0b5..0000000000 --- a/hack/validate/changelog-date-descending +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -changelogFile=${1:-CHANGELOG.md} - -if [ ! -r "$changelogFile" ]; then - echo "Unable to read file $changelogFile" >&2 - exit 1 -fi - -grep -e '^## ' "$changelogFile" | awk '{print$3}' | sort -c -r || exit 2 - -echo "Congratulations! Changelog $changelogFile dates are in descending order." diff --git a/hack/validate/changelog-well-formed b/hack/validate/changelog-well-formed deleted file mode 100755 index ea7ef0ff5d..0000000000 --- a/hack/validate/changelog-well-formed +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -changelogFile=${1:-CHANGELOG.md} - -if [ ! -r "$changelogFile" ]; then - echo "Unable to read file $changelogFile" >&2 - exit 1 -fi - -changelogWellFormed=1 - -# e.g. "## 1.12.3 (2016-10-26)" -VER_LINE_REGEX='^## [0-9]+\.[0-9]+\.[0-9]+(-ce)? \([0-9]+-[0-9]+-[0-9]+\)$' -while read -r line; do - if ! [[ "$line" =~ $VER_LINE_REGEX ]]; then - echo "Malformed changelog $changelogFile line \"$line\"" >&2 - changelogWellFormed=0 - fi -done < <(grep '^## ' $changelogFile) - -if [[ "$changelogWellFormed" == "1" ]]; then - echo "Congratulations! Changelog $changelogFile is well-formed." -else - exit 2 -fi diff --git a/hack/validate/default b/hack/validate/default index 8b688049af..9606df2db1 100755 --- a/hack/validate/default +++ b/hack/validate/default @@ -12,8 +12,6 @@ SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" . "${SCRIPTDIR}"/swagger . "${SCRIPTDIR}"/swagger-gen . "${SCRIPTDIR}"/toml -. "${SCRIPTDIR}"/changelog-well-formed -. "${SCRIPTDIR}"/changelog-date-descending . "${SCRIPTDIR}"/deprecate-integration-cli . "${SCRIPTDIR}"/golangci-lint . "${SCRIPTDIR}"/shfmt