Merge pull request #8995 from vrothberg/lint-lint-lint

[CI:DOCS] lint lint lint
This commit is contained in:
OpenShift Merge Robot
2021-01-17 15:38:30 -05:00
committed by GitHub
2 changed files with 14 additions and 8 deletions

View File

@ -21,5 +21,5 @@ for i in tunnel abi; do
echo Running golangci-lint for "$i" echo Running golangci-lint for "$i"
echo Build Tags "$i": ${BUILD_TAGS[$i]} echo Build Tags "$i": ${BUILD_TAGS[$i]}
echo Skipped directories "$i": ${SKIP_DIRS[$i]} echo Skipped directories "$i": ${SKIP_DIRS[$i]}
golangci-lint run --build-tags=${BUILD_TAGS[$i]} --skip-dirs=${SKIP_DIRS[$i]} "$@" ./bin/golangci-lint run --build-tags=${BUILD_TAGS[$i]} --skip-dirs=${SKIP_DIRS[$i]} "$@"
done done

View File

@ -1,17 +1,23 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e
die() { echo "${1:-No error message given} (from $(basename $0))"; exit 1; } die() { echo "${1:-No error message given} (from $(basename $0))"; exit 1; }
[ -n "$VERSION" ] || die "\$VERSION is empty or undefined" [ -n "$VERSION" ] || die "\$VERSION is empty or undefined"
[ -n "$GOBIN" ] || die "\$GOBIN is empty or undefined"
BIN="$GOBIN/golangci-lint" function install() {
echo "Installing golangci-lint v$VERSION into $BIN"
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b ./bin v$VERSION
}
BIN="./bin/golangci-lint"
if [ ! -x "$BIN" ]; then if [ ! -x "$BIN" ]; then
echo "Installing golangci-lint v$VERSION into $GOBIN" install
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOBIN v$VERSION
else else
# Prints its own file name as part of --version output # Prints its own file name as part of --version output
echo "Using existing $(dirname $BIN)/$($BIN --version)" $BIN --version | grep "$VERSION"
if [ $? -eq 0 ]; then
echo "Using existing $(dirname $BIN)/$($BIN --version)"
else
install
fi
fi fi