Merge pull request #538 from Random-Liu/improve-update-vendor
Change hack/update-vendor.sh to sync again with new vendor
This commit is contained in:
commit
859fb747d2
@ -21,7 +21,7 @@ set -o pipefail
|
|||||||
source $(dirname "${BASH_SOURCE[0]}")/utils.sh
|
source $(dirname "${BASH_SOURCE[0]}")/utils.sh
|
||||||
cd ${ROOT}
|
cd ${ROOT}
|
||||||
|
|
||||||
echo "Compare vendor with hack/versions..."
|
update_hack_versions() {
|
||||||
need_update=false
|
need_update=false
|
||||||
declare -A map=()
|
declare -A map=()
|
||||||
map["RUNC_VERSION"]="github.com/opencontainers/runc"
|
map["RUNC_VERSION"]="github.com/opencontainers/runc"
|
||||||
@ -47,6 +47,10 @@ if [ ${need_update} = true ]; then
|
|||||||
echo "Please update \"hack/versions\" by executing \"hack/update-vendor.sh\"!"
|
echo "Please update \"hack/versions\" by executing \"hack/update-vendor.sh\"!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "Compare vendor with hack/versions..."
|
||||||
|
update_hack_versions
|
||||||
|
|
||||||
# hack/versions should be correct now.
|
# hack/versions should be correct now.
|
||||||
echo "Compare vendor with containerd vendors..."
|
echo "Compare vendor with containerd vendors..."
|
||||||
@ -91,6 +95,9 @@ if ! diff vendor.conf ${tmp_vendor} > /dev/null; then
|
|||||||
fi
|
fi
|
||||||
rm ${containerd_vendor}
|
rm ${containerd_vendor}
|
||||||
|
|
||||||
|
echo "Compare new vendor with hack/versions..."
|
||||||
|
update_hack_versions
|
||||||
|
|
||||||
echo "Sort vendor.conf..."
|
echo "Sort vendor.conf..."
|
||||||
sort vendor.conf -o vendor.conf
|
sort vendor.conf -o vendor.conf
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user