Skip to content
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

Add Bazelisk support to Linux and Windows #490

Merged
merged 7 commits into from
Mar 5, 2020
Merged

Add Bazelisk support to Linux and Windows #490

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c802bb7
added bazelisk
Mar 3, 2020
775dcc7
moved bazelisk installation to bazel
Mar 3, 2020
7930c63
changed Validate-Bazel.ps1
Mar 3, 2020
a04342a
removed Install-Bazelisk.ps1
Mar 4, 2020
00e6385
changed bazel and bazelisk version output
Mar 4, 2020
bd175d0
fixed Validate-Bazel.ps1
Mar 4, 2020
d0c16c3
removed the extra "$" character
Mar 4, 2020
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
11 changes: 10 additions & 1 deletion images/linux/scripts/installers/bazel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -13,13 +13,22 @@ 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
echo "Bazel was not installed"
exit 1
fi

if ! command -v bazelisk; then
echo "Bazelisk was not installed"
exit 1
fi

# Document what was added to the image
echo "Lastly, documenting what we added to the metadata file"
DocumentInstalledItem "Bazel ($(bazel version))"
DocumentInstalledItem "Bazelisk ($(bazelisk version))"
2 changes: 1 addition & 1 deletion images/linux/ubuntu1604.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@
"{{template_dir}}/scripts/installers/azcopy.sh",
"{{template_dir}}/scripts/installers/azure-cli.sh",
"{{template_dir}}/scripts/installers/azure-devops-cli.sh",
"{{template_dir}}/scripts/installers/bazel.sh",
"{{template_dir}}/scripts/installers/1604/basic.sh",
"{{template_dir}}/scripts/installers/aws.sh",
"{{template_dir}}/scripts/installers/build-essential.sh",
Expand Down Expand Up @@ -153,6 +152,7 @@
"{{template_dir}}/scripts/installers/mono.sh",
"{{template_dir}}/scripts/installers/mysql.sh",
"{{template_dir}}/scripts/installers/nodejs.sh",
"{{template_dir}}/scripts/installers/bazel.sh",
"{{template_dir}}/scripts/installers/phantomjs.sh",
"{{template_dir}}/scripts/installers/1604/php.sh",
"{{template_dir}}/scripts/installers/pollinate.sh",
Expand Down
2 changes: 1 addition & 1 deletion images/linux/ubuntu1804.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
"{{template_dir}}/scripts/installers/azcopy.sh",
"{{template_dir}}/scripts/installers/azure-cli.sh",
"{{template_dir}}/scripts/installers/azure-devops-cli.sh",
"{{template_dir}}/scripts/installers/bazel.sh",
"{{template_dir}}/scripts/installers/1804/basic.sh",
"{{template_dir}}/scripts/installers/aws.sh",
"{{template_dir}}/scripts/installers/build-essential.sh",
Expand Down Expand Up @@ -156,6 +155,7 @@
"{{template_dir}}/scripts/installers/mono.sh",
"{{template_dir}}/scripts/installers/mysql.sh",
"{{template_dir}}/scripts/installers/nodejs.sh",
"{{template_dir}}/scripts/installers/bazel.sh",
"{{template_dir}}/scripts/installers/phantomjs.sh",
"{{template_dir}}/scripts/installers/1804/php.sh",
"{{template_dir}}/scripts/installers/pollinate.sh",
Expand Down
24 changes: 12 additions & 12 deletions images/win/Windows2016-Azure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,12 @@
"{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-Bazel.ps1"
]
},
{
"type": "powershell",
"scripts":[
Expand Down Expand Up @@ -570,12 +576,6 @@
"{{ template_dir }}/scripts/Installers/Install-Kind.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-Bazel.ps1"
]
},
{
"type": "windows-restart",
"restart_timeout": "30m"
Expand Down Expand Up @@ -711,6 +711,12 @@
"{{ template_dir }}/scripts/Installers/Validate-NodeLts.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-Bazel.ps1"
]
},
{
"type": "powershell",
"scripts":[
Expand Down Expand Up @@ -849,12 +855,6 @@
"{{ template_dir }}/scripts/Installers/Validate-Kind.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-Bazel.ps1"
]
},
{
"type": "file",
"source": "C:\\InstalledSoftware.md",
Expand Down
6 changes: 4 additions & 2 deletions images/win/scripts/Installers/Install-Bazel.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
################################################################################
## File: Install-Bazel.ps1
## Desc: Install Bazel
## Desc: Install Bazel and Bazelisk (A user-friendly launcher for Bazel)
################################################################################

choco install bazel -y
choco install bazel -y

npm install -g @bazel/bazelisk
23 changes: 21 additions & 2 deletions images/win/scripts/Installers/Validate-Bazel.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################
## File: Validate-Bazel.ps1
## Desc: Validate Bazel
## Desc: Validate Bazel and Bazelisk (A user-friendly launcher for Bazel)
################################################################################

if (Get-Command -Name 'bazel')
Expand All @@ -13,11 +13,30 @@ else
exit 1
}

# Adding description of the software to Markdown
if (Get-Command -Name 'bazelisk')
{
Write-Host "bazelisk on path"
}
else
{
Write-Host 'bazelisk is not on path'
exit 1
}

# Adding description of Bazel to Markdown
$SoftwareName = "bazel"

$Description = @"
_Version:_ $(bazel --version)<br/>
"@

Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description

# Adding description of Bazelisk to Markdown
$SoftwareName = "bazelisk"

$Description = @"
_Version:_ $(bazelisk version)<br/>
"@

Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description