Skip to content

Commit

Permalink
etcd 3.4: Install shellcheck if not installed.
Browse files Browse the repository at this point in the history
Include conditional logic to install shellcheck with correct architecture.

This is based on commit 4f23883 and pull request #14872.

Signed-off-by: D Tripp <[email protected]>
  • Loading branch information
thedtripp committed Jun 28, 2024
1 parent f599316 commit e3c0ac0
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ clean:
rm -f ./integration/127.0.0.1:* ./integration/localhost:*
rm -f ./clientv3/integration/127.0.0.1:* ./clientv3/integration/localhost:*
rm -f ./clientv3/ordering/127.0.0.1:* ./clientv3/ordering/localhost:*
rm -rf ./bin/shellcheck*

docker-clean:
docker images
Expand Down
26 changes: 24 additions & 2 deletions test
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export ETCD_VERIFY=all
source ./build

PASSES=${PASSES:-}
SHELLCHECK_VERSION=${SHELLCHECK_VERSION:-"v0.10.0"}

# build before setting up test GOPATH
if [[ "${PASSES}" == *"functional"* ]]; then
Expand Down Expand Up @@ -397,12 +398,33 @@ function release_pass {
}

function shellcheck_pass {
if command -v shellcheck >/dev/null; then
shellcheckResult=$(shellcheck -fgcc build test scripts/*.sh 2>&1 || true)
SHELLCHECK=shellcheck

if ! command -v $SHELLCHECK >/dev/null; then
echo "Installing shellcheck $SHELLCHECK_VERSION"
if [ "$GOARCH" == "amd64" ]; then
URL="https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz"
elif [[ "$GOARCH" == "arm" || "$GOARCH" == "arm64" ]]; then
URL="https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.aarch64.tar.xz"
else
echo "Unsupported architecture: $GOARCH"
exit 255
fi

wget -qO- "$URL" | tar -xJv -C /tmp/ --strip-components=1
mkdir -p ./bin
mv /tmp/shellcheck ./bin/
SHELLCHECK=./bin/shellcheck
fi

if command -v $SHELLCHECK >/dev/null; then
shellcheckResult=$(${SHELLCHECK} -fgcc build test scripts/*.sh 2>&1 || true)
if [ -n "${shellcheckResult}" ]; then
echo -e "shellcheck checking failed:\\n${shellcheckResult}"
exit 255
fi
else
echo "Skipping shellcheck..."
fi
}

Expand Down

0 comments on commit e3c0ac0

Please sign in to comment.