From d1ff94b26e93873caf1952c2564372bc875272d7 Mon Sep 17 00:00:00 2001 From: Joris Baum Date: Tue, 24 Feb 2026 17:04:45 +0100 Subject: [PATCH] Reuse installed ginkgo and use cleaner binary check --- scripts/subtests/lint | 8 ++------ scripts/subtests/spec-test | 5 +---- scripts/subtests/unit-test | 8 +++++--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/scripts/subtests/lint b/scripts/subtests/lint index bc83445e..7332e721 100755 --- a/scripts/subtests/lint +++ b/scripts/subtests/lint @@ -5,14 +5,10 @@ set -o pipefail SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -set +e -golangci_lint_executable=$(which golangci-lint) -set -e -if [ -z "${golangci_lint_executable}" ] || [ ! -x "${golangci_lint_executable}" ]; then +if ! command -v golangci-lint &> /dev/null; then go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest fi pushd "${SCRIPT_DIR}/../../src" > /dev/null golangci-lint run ./... -popd > /dev/null - +popd > /dev/null \ No newline at end of file diff --git a/scripts/subtests/spec-test b/scripts/subtests/spec-test index d8c8313e..0cd3756b 100755 --- a/scripts/subtests/spec-test +++ b/scripts/subtests/spec-test @@ -5,10 +5,7 @@ set -o pipefail SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -set +e -bundler_executable=$(which bundle) -set -e -if [ -z "${bundler_executable}" ] || [ ! -x "${bundler_executable}" ]; then +if ! command -v bundle &> /dev/null; then gem install bundler fi diff --git a/scripts/subtests/unit-test b/scripts/subtests/unit-test index 45688302..cba0b9ad 100755 --- a/scripts/subtests/unit-test +++ b/scripts/subtests/unit-test @@ -11,6 +11,8 @@ if [ "${CI:-false}" = 'false' ]; then fi pushd "${SCRIPT_DIR}/../../src" > /dev/null - go run github.com/onsi/ginkgo/v2/ginkgo $flags -popd > /dev/null - + if ! command -v ginkgo &> /dev/null; then + go install github.com/onsi/ginkgo/v2/ginkgo@latest + fi + ginkgo $flags +popd > /dev/null \ No newline at end of file