Merge pull request #14835 from edsantiago/fix_golangci_install

golangci install: explicitly set BINDIR
This commit is contained in:
openshift-ci[bot] 2022-07-06 07:09:00 +00:00 committed by GitHub
commit 49df3cc5cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions

View File

@ -9,14 +9,17 @@ function install() {
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v$VERSION curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v$VERSION
} }
BIN="./bin/golangci-lint" # Undocumented behavior: golangci-lint installer requires $BINDIR in env,
# will default to ./bin but we can't rely on that.
export BINDIR="./bin"
BIN="$BINDIR/golangci-lint"
if [ ! -x "$BIN" ]; then if [ ! -x "$BIN" ]; then
install install
else else
# Prints its own file name as part of --version output # Prints its own file name as part of --version output
$BIN --version | grep "$VERSION" $BIN --version | grep "$VERSION"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Using existing $(dirname $BIN)/$($BIN --version)" echo "Using existing $BINDIR/$($BIN --version)"
else else
install install
fi fi