Add Bazelisk support to Linux and Windows (#490)

* added bazelisk

* moved bazelisk installation to bazel

* changed Validate-Bazel.ps1

* removed Install-Bazelisk.ps1

* changed bazel and bazelisk version output

* fixed Validate-Bazel.ps1

* removed the extra "$" character
This commit is contained in:
Maxim Lobanov
2020-03-05 10:30:24 +03:00
committed by GitHub
parent a94c37ae3e
commit 5a2acbc6f0
6 changed files with 54 additions and 20 deletions

View File

@@ -1,7 +1,7 @@
#!/bin/bash
################################################################################
## File: bazel.sh
## Desc: Installs bazel
## Desc: Installs Bazel and Bazelisk (A user-friendly launcher for Bazel)
################################################################################
# Source the helpers for use with the script
@@ -13,6 +13,9 @@ echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" |
apt-get update -y
apt-get install -y bazel
# Install bazelisk
npm install -g @bazel/bazelisk
# Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work"
if ! command -v bazel; then
@@ -20,6 +23,14 @@ if ! command -v bazel; then
exit 1
fi
if ! command -v bazelisk; then
echo "Bazelisk was not installed"
exit 1
fi
# Document what was added to the image
bazelisk_version = $(bazelisk version | grep "Bazelisk version:" | cut -d ":" -f 2)
echo "Lastly, documenting what we added to the metadata file"
DocumentInstalledItem "Bazel ($(bazel version))"
DocumentInstalledItem "Bazel ($(bazel --version))"
DocumentInstalledItem "Bazelisk ($bazelisk_version)"