Skip to content

K
k3s
Commit 775f5d23 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #51911 from cblecker/fix-clean

Automatic merge from submit-queue (batch tested with PRs 51915, 51294, 51562, 51911) make clean will remove all gitignored files **What this PR does / why we need it**: During review of #51766, it was noticed that we don't fully clean all gitignored files when we run "make clean": https://github.com/kubernetes/kubernetes/pull/51766#discussion_r136688728 This change will change `make clean` to use `git clean` to remove all files in the gitignore. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 1732a8b9 b6f64194
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
.gitignore
View file @ 775f5d23
...@@ -120,5 +120,8 @@ zz_generated.openapi.go ...@@ -120,5 +120,8 @@ zz_generated.openapi.go
# This file used by some vendor repos (e.g. github.com/go-openapi/...) to store secret variables and should not be ignored # This file used by some vendor repos (e.g. github.com/go-openapi/...) to store secret variables and should not be ignored
!\.drone\.sec !\.drone\.sec
# Godeps workspace
/Godeps/_workspace
/bazel-* /bazel-*
*.pyc *.pyc
build/common.sh
View file @ 775f5d23
...@@ -409,8 +409,10 @@ function kube::build::clean() { ...@@ -409,8 +409,10 @@ function kube::build::clean() {
"${DOCKER[@]}" rmi $("${DOCKER[@]}" images -q --filter 'dangling=true') 2> /dev/null || true "${DOCKER[@]}" rmi $("${DOCKER[@]}" images -q --filter 'dangling=true') 2> /dev/null || true
fi fi
kube::log::status "Removing _output directory" if [[ -d "${LOCAL_OUTPUT_ROOT}" ]]; then
rm -rf "${LOCAL_OUTPUT_ROOT}" kube::log::status "Removing _output directory"
rm -rf "${LOCAL_OUTPUT_ROOT}"
fi
} }
# Set up the context directory for the kube-build image and build it. # Set up the context directory for the kube-build image and build it.
......
build/root/Makefile
View file @ 775f5d23
...@@ -309,10 +309,7 @@ clean: ...@@ -309,10 +309,7 @@ clean:
else else
clean: clean_meta clean: clean_meta
build/make-clean.sh build/make-clean.sh
rm -rf $(OUT_DIR) git clean -Xdf
rm -rf Godeps/_workspace # Just until we are sure it is gone
# TODO(thockin): Remove this when we call clean_generated.
rm -f pkg/generated/openapi/zz_generated.openapi.go
endif endif
define CLEAN_META_HELP_INFO define CLEAN_META_HELP_INFO
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment