Skip to content

K
k3s
Commit c91950f0 authored by Piotr Szczesniak's avatar Piotr Szczesniak
Browse files
Options

Merge pull request #12566 from uluyol/cleanup-convcopy

Add missing argument to function call and don't set GOPATH directly
parents fe5bebba eba19cc9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
hack/after-build/update-generated-conversions.sh
View file @ c91950f0
...@@ -44,7 +44,7 @@ EOF ...@@ -44,7 +44,7 @@ EOF
// AUTO-GENERATED FUNCTIONS END HERE // AUTO-GENERATED FUNCTIONS END HERE
EOF EOF
env GOPATH=$(godep path):$GOPATH goimports -w "$TMPFILE" goimports -w "$TMPFILE"
mv "$TMPFILE" "pkg/${version}/conversion_generated.go" mv "$TMPFILE" "pkg/${version}/conversion_generated.go"
} }
......
hack/after-build/update-generated-deep-copies.sh
View file @ c91950f0
...@@ -56,7 +56,7 @@ EOF ...@@ -56,7 +56,7 @@ EOF
// AUTO-GENERATED FUNCTIONS END HERE // AUTO-GENERATED FUNCTIONS END HERE
EOF EOF
env GOPATH=$(godep path):$GOPATH goimports -w "$TMPFILE" goimports -w "$TMPFILE"
mv "$TMPFILE" `result_file_name ${version}` mv "$TMPFILE" `result_file_name ${version}`
} }
...@@ -76,4 +76,4 @@ function generate_deep_copies() { ...@@ -76,4 +76,4 @@ function generate_deep_copies() {
DEFAULT_VERSIONS="api/ api/v1 expapi/ expapi/v1" DEFAULT_VERSIONS="api/ api/v1 expapi/ expapi/v1"
VERSIONS=${VERSIONS:-$DEFAULT_VERSIONS} VERSIONS=${VERSIONS:-$DEFAULT_VERSIONS}
generate_deep_copies generate_deep_copies "$VERSIONS"
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