Skip to content

bazelisk.py supports bazeliskVersion #791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jwnimmer-tri wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bazelisk.py supports bazeliskVersion #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions bazelisk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,10 @@ def main(argv=None):
if argv is None:
argv = sys.argv

if argv[1:] == ["bazeliskVersion"]:
print("Bazelisk version: Python")
return 0

bazel_path = get_bazel_path()

argv = argv[1:]
Expand Down
20 changes: 17 additions & 3 deletions bazelisk_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ else
fi
# --- end runfiles.bash initialization ---

BAZELISK_VERSION=$1
BAZELISK_TEST_LANG=$1 # One of "GO", "PY", or "PY3".
shift 1

# TODO: only the Python version reads bazelbuild-releases.json since it uses
Expand Down Expand Up @@ -65,7 +65,7 @@ function setup() {

function bazelisk() {
if [[ -n $(rlocation _main/bazelisk.py) ]]; then
if [[ $BAZELISK_VERSION == "PY3" ]]; then
if [[ $BAZELISK_TEST_LANG == "PY3" ]]; then
echo "Running Bazelisk with $(python3 -V)..."
python3 "$(rlocation _main/bazelisk.py)" "$@"
else
Expand Down Expand Up @@ -95,6 +95,16 @@ function bazelisk() {
fi
}

function test_bazelisk_version() {
setup

BAZELISK_HOME="$BAZELISK_HOME" \
bazelisk bazeliskVersion 2>&1 | tee log

grep "Bazelisk version: " log || \
(echo "FAIL: Expected to find 'Bazelisk version' in the output of 'bazelisk bazeliskVersion'"; exit 1)
}

function test_bazel_version_py() {
setup

Expand Down Expand Up @@ -517,6 +527,10 @@ function test_bazel_prepend_binary_directory_to_path_py() {
(echo "FAIL: Expected PATH to contains bazel binary directory."; exit 1)
}

echo "# test_bazelisk_version"
test_bazelisk_version
echo

echo "# test_bazel_version_from_environment"
test_bazel_version_from_environment
echo
Expand All @@ -541,7 +555,7 @@ echo "# test_BAZELISK_NOJDK"
test_BAZELISK_NOJDK
echo

if [[ $BAZELISK_VERSION == "GO" ]]; then
if [[ $BAZELISK_TEST_LANG == "GO" ]]; then
echo "# test_bazel_version_go"
test_bazel_version_go
echo
Expand Down