Fix make validate on MacOS outside container

This commit is contained in:
Damien Duportal 2019-05-06 09:40:04 +02:00 committed by Traefiker Bot
parent 79ad4b4544
commit 72397ef90c
4 changed files with 7 additions and 6 deletions

View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e
export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
SCRIPT_DIR="$( cd "$( dirname "${0}" )" && pwd -P)"; export SCRIPT_DIR
export DEST=.
TESTFLAGS="${TESTFLAGS} -test.timeout=20m -check.v"
@ -25,4 +25,4 @@ fi
if [ -n "$TEST_HOST" ]; then
echo "Testing from host…"
CGO_ENABLED=0 go test -integration -host $TESTFLAGS
fi
fi

View file

@ -5,7 +5,8 @@ set -e
CERT_IMAGE="alpine:edge"
# cd to the current directory so the script can be run from anywhere.
cd `dirname $0`
SCRIPT_DIR="$( cd "$( dirname "${0}" )" && pwd -P)"; export SCRIPT_DIR
cd "${SCRIPT_DIR}"
# Update the cert image.
docker pull $CERT_IMAGE

View file

@ -1,6 +1,6 @@
#!/bin/bash -e
HACK_DIR=$(dirname "${BASH_SOURCE}")
HACK_DIR="$( cd "$( dirname "${0}" )" && pwd -P)"; export HACK_DIR
REPO_ROOT=${HACK_DIR}/..
${REPO_ROOT}/vendor/k8s.io/code-generator/generate-groups.sh \

View file

@ -3,14 +3,14 @@ set -o errexit
set -o pipefail
set -o nounset
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"; export SCRIPT_DIR
SCRIPT_DIR="$( cd "$( dirname "${0}" )" && pwd -P)"; export SCRIPT_DIR
vendor_dir="./vendor/"
# We run dep install to and see if we have a diff afterwards
echo "checking ${vendor_dir} for unintentional changes..."
dep ensure -v
(${SCRIPT_DIR}/prune-dep.sh)
("${SCRIPT_DIR}"/prune-dep.sh)
# Let see if the working directory is clean
diffs="$(git status --porcelain -- ${vendor_dir} 2>/dev/null)"