Skip to content

Commit ff71371

Browse files
figok8s-ci-robot
authored andcommitted
Fix an issue with verify_client.sh (kubernetes-sigs#805)
no need to copy files back from tmp folder. also CI will call make clientset, so we need to run make gazelle on clientset target.
1 parent e9f8041 commit ff71371

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ clientset: ## Generate a typed clientset
101101
--listers-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
102102
--output-package sigs.k8s.io/cluster-api/pkg/client/informers_generated \
103103
--go-header-file=./hack/boilerplate.go.txt
104+
$(MAKE) gazelle
104105

105106
.PHONY: clean
106107
clean: ## Remove all generated files

hack/verify_clientset.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,10 @@ mkdir -p "${TMP_DIFFROOT}"
3535
cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
3636

3737
make clientset
38-
find "${TMP_DIFFROOT}" -name *.bazel -delete
3938

4039
echo "diffing ${DIFFROOT} against freshly generated codegen"
4140
ret=0
4241
diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" -x '*.bazel' -x 'BUILD' || ret=$?
43-
cp -a "${TMP_DIFFROOT}"/* "${DIFFROOT}"
4442
if [[ $ret -eq 0 ]]
4543
then
4644
echo "${DIFFROOT} up to date."

0 commit comments

Comments
 (0)