diff --git a/hack/dep.sh b/hack/dep.sh deleted file mode 100755 index 9e98b6ef5..000000000 --- a/hack/dep.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - -# Copyright 2018 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#!/bin/bash -set -e -o pipefail - -DEP_VERSION=v0.5.0 -DEP_DIR="$GOPATH/src/github.com/golang/dep" - -install_dep() { - echo "Installing dep ${DEP_VERSION}" - if [ ! -d "$DEP_DIR" ]; then - go get -u -d github.com/golang/dep/cmd/dep - fi - cd $DEP_DIR - git checkout -q ${DEP_VERSION} - go build -o $GOPATH/bin/dep github.com/golang/dep/cmd/dep -} - -if [ -z "$VALIDATE_UPSTREAM" ]; then - VALIDATE_REPO='git@github.com:GoogleContainerTools/kaniko.git' - VALIDATE_BRANCH='master' - - VALIDATE_HEAD="$(git rev-parse --verify HEAD)" - - git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH" - VALIDATE_UPSTREAM="$(git rev-parse --verify FETCH_HEAD)" - - VALIDATE_COMMIT_DIFF="$VALIDATE_UPSTREAM...$VALIDATE_HEAD" - - validate_diff() { - if [ "$VALIDATE_UPSTREAM" != "$VALIDATE_HEAD" ]; then - git diff "$VALIDATE_COMMIT_DIFF" "$@" - fi - } -fi -# See if there have been upstream changes -IFS=$'\n' -files=( $(validate_diff --name-only -- 'Gopkg.toml' 'Gopkg.lock' 'vendor/' || true) ) -unset IFS - -if [ ${#files[@]} -gt 0 ]; then - if ! [ -x "$(command -v dep)" ]; then - install_dep - fi - dep ensure - diffs="$(git status --porcelain -- vendor Gopkg.toml Gopkg.lock 2>/dev/null)" - if [ "$diffs" ]; then - { - echo 'Vendor not reproducible, please commit these changes to fix.' - echo - echo "$diffs" - } >&2 - false - fi -else - echo 'No vendor changes from upstream. Skipping dep ensure, dep prune' -fi diff --git a/test.sh b/test.sh index c86b974cd..883aee5b2 100755 --- a/test.sh +++ b/test.sh @@ -32,7 +32,6 @@ scripts=( "hack/boilerplate.sh" "hack/gofmt.sh" "hack/linter.sh" - "hack/dep.sh" ) fail=0 for s in "${scripts[@]}"