renamed update files so that protoc is run before CRD update.
If generating protoc go files from scratch, `make update` fails if CRD generation happens first, since the protoc-generated files are imported by the api go files. protoc generation needs to happen earlier. Signed-off-by: Scott Seago <sseago@redhat.com>pull/4943/head
parent
2c037b7491
commit
6b8353081a
|
@ -15,4 +15,4 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
HACK_DIR=$(dirname "${BASH_SOURCE[0]}")
|
HACK_DIR=$(dirname "${BASH_SOURCE[0]}")
|
||||||
"${HACK_DIR}"/update-fmt.sh --verify
|
"${HACK_DIR}"/update-1fmt.sh --verify
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
HACK_DIR=$(dirname "${BASH_SOURCE}")
|
HACK_DIR=$(dirname "${BASH_SOURCE}")
|
||||||
|
|
||||||
${HACK_DIR}/update-generated-crd-code.sh
|
${HACK_DIR}/update-3generated-crd-code.sh
|
||||||
|
|
||||||
# ensure no changes to generated CRDs
|
# ensure no changes to generated CRDs
|
||||||
if ! git diff --exit-code config/crd/v1/crds/crds.go >/dev/null; then
|
if ! git diff --exit-code config/crd/v1/crds/crds.go >/dev/null; then
|
||||||
|
|
|
@ -27,7 +27,7 @@ cleanup() {
|
||||||
}
|
}
|
||||||
|
|
||||||
echo "Verifying generated Github issue template"
|
echo "Verifying generated Github issue template"
|
||||||
${HACK_DIR}/update-generated-issue-template.sh ${OUT_TMP_FILE} > /dev/null
|
${HACK_DIR}/update-4generated-issue-template.sh ${OUT_TMP_FILE} > /dev/null
|
||||||
output=$(echo "`diff ${ISSUE_TEMPLATE_FILE} ${OUT_TMP_FILE}`")
|
output=$(echo "`diff ${ISSUE_TEMPLATE_FILE} ${OUT_TMP_FILE}`")
|
||||||
|
|
||||||
if [[ -n "${output}" ]] ; then
|
if [[ -n "${output}" ]] ; then
|
||||||
|
|
Loading…
Reference in New Issue