Skip to content

Commit

Permalink
add ninja build to Linux images
Browse files Browse the repository at this point in the history
Add ninja-build to the Linux images.  It is already present on the
Windows builders and is very often used with CMake.

Issue: actions#741
  • Loading branch information
compnerd committed Apr 19, 2020
1 parent b1cf25f commit 18fcdf7
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 0 deletions.
25 changes: 25 additions & 0 deletions images/linux/scripts/installers/ninja.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash
################################################################################
## File: ninja.sh
## Desc: Installs ninja
################################################################################

# Source the helpers for use with the script
source $HELPER_SCRIPTS/document.sh
source $HELPER_SCRIPTS/apt.sh

set -e

echo "Install ninja"
apt-get install -y --no-install-recommends ninja-build

# 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 ninja ; then
echo "$cmd was not installed"
exit 1
fi

# Document what was added to the image
echo "Lastly, documenting what we added to the metadata file"
DocumentInstalledItem "ninja"
1 change: 1 addition & 0 deletions images/linux/ubuntu1604.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
"{{template_dir}}/scripts/installers/miniconda.sh",
"{{template_dir}}/scripts/installers/mono.sh",
"{{template_dir}}/scripts/installers/mysql.sh",
"{{template_dir}}/scripts/installers/ninja.sh",
"{{template_dir}}/scripts/installers/nodejs.sh",
"{{template_dir}}/scripts/installers/bazel.sh",
"{{template_dir}}/scripts/installers/phantomjs.sh",
Expand Down
1 change: 1 addition & 0 deletions images/linux/ubuntu1804.json
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@
"{{template_dir}}/scripts/installers/miniconda.sh",
"{{template_dir}}/scripts/installers/mono.sh",
"{{template_dir}}/scripts/installers/mysql.sh",
"{{template_dir}}/scripts/installers/ninja.sh",
"{{template_dir}}/scripts/installers/nvm.sh",
"{{template_dir}}/scripts/installers/nodejs.sh",
"{{template_dir}}/scripts/installers/bazel.sh",
Expand Down

0 comments on commit 18fcdf7

Please sign in to comment.