Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
86f29e21
Commit
86f29e21
authored
Apr 04, 2019
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up generated file warnings, add recursive dependency detection
parent
4d380ee2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
update-vendor.sh
hack/update-vendor.sh
+10
-6
No files found.
hack/update-vendor.sh
View file @
86f29e21
...
@@ -232,6 +232,14 @@ for repo in $(tsort "${TMP_DIR}/tidy_deps.txt"); do
...
@@ -232,6 +232,14 @@ for repo in $(tsort "${TMP_DIR}/tidy_deps.txt"); do
pushd
"
${
KUBE_ROOT
}
/staging/src/
${
repo
}
"
>
/dev/null 2>&1
pushd
"
${
KUBE_ROOT
}
/staging/src/
${
repo
}
"
>
/dev/null 2>&1
echo
"=== tidying
${
repo
}
"
>>
"
${
LOG_FILE
}
"
echo
"=== tidying
${
repo
}
"
>>
"
${
LOG_FILE
}
"
go mod tidy
>>
"
${
LOG_FILE
}
"
2>&1
go mod tidy
>>
"
${
LOG_FILE
}
"
2>&1
# disallow transitive dependencies on k8s.io/kubernetes
loopback_deps
=
"
$(
go list all 2>/dev/null |
grep
k8s.io/kubernetes/
||
true
)
"
if
[[
!
-z
"
${
loopback_deps
}
"
]]
;
then
kube::log::error
"Disallowed
${
repo
}
-> k8s.io/kubernetes dependencies exist via the following imports:
$(
go mod why
${
loopback_deps
})
"
exit
1
fi
popd
>
/dev/null 2>&1
popd
>
/dev/null 2>&1
done
done
echo
"=== tidying root"
>>
"
${
LOG_FILE
}
"
echo
"=== tidying root"
>>
"
${
LOG_FILE
}
"
...
@@ -241,17 +249,13 @@ go mod tidy >>"${LOG_FILE}" 2>&1
...
@@ -241,17 +249,13 @@ go mod tidy >>"${LOG_FILE}" 2>&1
# Phase 6: add generated comments to go.mod files
# Phase 6: add generated comments to go.mod files
kube::log::status
"go.mod: adding generated comments"
kube::log::status
"go.mod: adding generated comments"
add_generated_comments
"
add_generated_comments
"
// This is a generated file.
// This is a generated file.
Do not edit directly.
// Run hack/pin-dependency.sh to change pinned dependency versions.
// Run hack/pin-dependency.sh to change pinned dependency versions.
// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
"
"
for
repo
in
$(
ls
staging/src/k8s.io |
sort
)
;
do
for
repo
in
$(
ls
staging/src/k8s.io |
sort
)
;
do
pushd
"staging/src/k8s.io/
${
repo
}
"
>
/dev/null 2>&1
pushd
"staging/src/k8s.io/
${
repo
}
"
>
/dev/null 2>&1
add_generated_comments
"
add_generated_comments
"// This is a generated file. Do not edit directly."
// This is a generated file. Do not edit directly.
// Run hack/pin-dependency.sh to change pinned dependency versions.
// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
"
popd
>
/dev/null 2>&1
popd
>
/dev/null 2>&1
done
done
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment