Merge pull request #116284 from thockin/codegen_subprojects_cleanup_verify

Codegen: subprojects: clean up verify scripts
This commit is contained in:
Kubernetes Prow Robot 2023-03-06 00:14:59 -08:00 committed by GitHub
commit 931e07de16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 48 deletions

View File

@ -18,14 +18,12 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
DIFFROOT="${SCRIPT_ROOT}/pkg" DIFFROOT="${SCRIPT_ROOT}/pkg"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg" TMP_DIFFROOT="$(mktemp -d -t "$(basename "$0").XXXXXX")/pkg"
_tmp="${SCRIPT_ROOT}/_tmp"
cleanup() { cleanup() {
rm -rf "${_tmp}" rm -rf "${TMP_DIFFROOT}"
} }
trap "cleanup" EXIT SIGINT trap "cleanup" EXIT SIGINT
@ -38,9 +36,7 @@ cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
echo "diffing ${DIFFROOT} against freshly generated codegen" echo "diffing ${DIFFROOT} against freshly generated codegen"
ret=0 ret=0
diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$? diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?
cp -a "${TMP_DIFFROOT}"/* "${DIFFROOT}" if [[ $ret -eq 0 ]]; then
if [[ $ret -eq 0 ]]
then
echo "${DIFFROOT} up to date." echo "${DIFFROOT} up to date."
else else
echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh" echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh"

View File

@ -18,14 +18,12 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
DIFFROOT="${SCRIPT_ROOT}/pkg" DIFFROOT="${SCRIPT_ROOT}/pkg"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg" TMP_DIFFROOT="$(mktemp -d -t "$(basename "$0").XXXXXX")/pkg"
_tmp="${SCRIPT_ROOT}/_tmp"
cleanup() { cleanup() {
rm -rf "${_tmp}" rm -rf "${TMP_DIFFROOT}"
} }
trap "cleanup" EXIT SIGINT trap "cleanup" EXIT SIGINT
@ -38,9 +36,7 @@ cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
echo "diffing ${DIFFROOT} against freshly generated codegen" echo "diffing ${DIFFROOT} against freshly generated codegen"
ret=0 ret=0
diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$? diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?
cp -a "${TMP_DIFFROOT}"/* "${DIFFROOT}" if [[ $ret -eq 0 ]]; then
if [[ $ret -eq 0 ]]
then
echo "${DIFFROOT} up to date." echo "${DIFFROOT} up to date."
else else
echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh" echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh"

View File

@ -18,14 +18,12 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
DIFFROOT="${SCRIPT_ROOT}/pkg" DIFFROOT="${SCRIPT_ROOT}/pkg"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg" TMP_DIFFROOT="$(mktemp -d -t "$(basename "$0").XXXXXX")/pkg"
_tmp="${SCRIPT_ROOT}/_tmp"
cleanup() { cleanup() {
rm -rf "${_tmp}" rm -rf "${TMP_DIFFROOT}"
} }
trap "cleanup" EXIT SIGINT trap "cleanup" EXIT SIGINT
@ -38,9 +36,7 @@ cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
echo "diffing ${DIFFROOT} against freshly generated codegen" echo "diffing ${DIFFROOT} against freshly generated codegen"
ret=0 ret=0
diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$? diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?
cp -a "${TMP_DIFFROOT}"/* "${DIFFROOT}" if [[ $ret -eq 0 ]]; then
if [[ $ret -eq 0 ]]
then
echo "${DIFFROOT} up to date." echo "${DIFFROOT} up to date."
else else
echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh" echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh"

View File

@ -18,14 +18,12 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
DIFFROOT="${SCRIPT_ROOT}/pkg" DIFFROOT="${SCRIPT_ROOT}/pkg"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg" TMP_DIFFROOT="$(mktemp -d -t "$(basename "$0").XXXXXX")/pkg"
_tmp="${SCRIPT_ROOT}/_tmp"
cleanup() { cleanup() {
rm -rf "${_tmp}" rm -rf "${TMP_DIFFROOT}"
} }
trap "cleanup" EXIT SIGINT trap "cleanup" EXIT SIGINT
@ -38,9 +36,7 @@ cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
echo "diffing ${DIFFROOT} against freshly generated codegen" echo "diffing ${DIFFROOT} against freshly generated codegen"
ret=0 ret=0
diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$? diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?
cp -a "${TMP_DIFFROOT}"/* "${DIFFROOT}" if [[ $ret -eq 0 ]]; then
if [[ $ret -eq 0 ]]
then
echo "${DIFFROOT} up to date." echo "${DIFFROOT} up to date."
else else
echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh" echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh"

View File

@ -18,14 +18,12 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
DIFFROOT="${SCRIPT_ROOT}/pkg" DIFFROOT="${SCRIPT_ROOT}/pkg"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg" TMP_DIFFROOT="$(mktemp -d -t "$(basename "$0").XXXXXX")/pkg"
_tmp="${SCRIPT_ROOT}/_tmp"
cleanup() { cleanup() {
rm -rf "${_tmp}" rm -rf "${TMP_DIFFROOT}"
} }
trap "cleanup" EXIT SIGINT trap "cleanup" EXIT SIGINT
@ -38,9 +36,7 @@ cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
echo "diffing ${DIFFROOT} against freshly generated codegen" echo "diffing ${DIFFROOT} against freshly generated codegen"
ret=0 ret=0
diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$? diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?
cp -a "${TMP_DIFFROOT}"/* "${DIFFROOT}" if [[ $ret -eq 0 ]]; then
if [[ $ret -eq 0 ]]
then
echo "${DIFFROOT} up to date." echo "${DIFFROOT} up to date."
else else
echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh" echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh"

View File

@ -18,14 +18,12 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
DIFFROOT="${SCRIPT_ROOT}/pkg" DIFFROOT="${SCRIPT_ROOT}/pkg"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg" TMP_DIFFROOT="$(mktemp -d -t "$(basename "$0").XXXXXX")/pkg"
_tmp="${SCRIPT_ROOT}/_tmp"
cleanup() { cleanup() {
rm -rf "${_tmp}" rm -rf "${TMP_DIFFROOT}"
} }
trap "cleanup" EXIT SIGINT trap "cleanup" EXIT SIGINT
@ -38,9 +36,7 @@ cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
echo "diffing ${DIFFROOT} against freshly generated codegen" echo "diffing ${DIFFROOT} against freshly generated codegen"
ret=0 ret=0
diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$? diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?
cp -a "${TMP_DIFFROOT}"/* "${DIFFROOT}" if [[ $ret -eq 0 ]]; then
if [[ $ret -eq 0 ]]
then
echo "${DIFFROOT} up to date." echo "${DIFFROOT} up to date."
else else
echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh" echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh"