0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #43212 from thaJeztah/fix_vendor

Browse source 
hack/vendor.sh: run "go mod tidy" before vendoring
This commit is contained in:
Sebastiaan van Stijn 2022-02-05 19:55:40 +01:00 • committed by GitHub
commit 36313c4bdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hack/validate/vendor
View file

@ -3,11 +3,6 @@
SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "${SCRIPTDIR}/.validate"
go_mod_tidy(){
${SCRIPTDIR}/../go-mod-prepare.sh
GO111MODULE=auto go mod tidy -modfile 'vendor.mod' -compat 1.17
}
validate_vendor_diff(){
IFS=$'\n'
check_files=( 'vendor.sum' 'vendor.mod' 'vendor/' )
@ -54,6 +49,5 @@ validate_vendor_used() {
done
}
go_mod_tidy
validate_vendor_diff
validate_vendor_used

3
hack/vendor.sh
View file

@ -8,9 +8,10 @@ set -e
set -x
SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
${SCRIPTDIR}/go-mod-prepare.sh
"${SCRIPTDIR}"/go-mod-prepare.sh
if [ $# -eq 0 ] || [ "$1" != "archive/tar" ]; then
GO111MODULE=auto go mod tidy -modfile 'vendor.mod' -compat 1.17
GO111MODULE=auto go mod vendor -modfile vendor.mod
fi