actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-20 06:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

depreacted BOOST_ROOT env variable

Browse Source
This commit is contained in:
Aleksandr Chebotov
2020-03-16 12:51:40 +03:00
parent 7584c7b879
commit 6be8521bf6
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
images/linux/scripts/installers/boost.sh
View File

@@ -7,18 +7,16 @@
# Source the helpers for use with the script # Source the helpers for use with the script
source $HELPER_SCRIPTS/document.sh source $HELPER_SCRIPTS/document.sh
TOOLSET_PATH="$INSTALLER_SCRIPT_FOLDER/toolcache.json"
BOOST_LIB=/usr/local/share/boost BOOST_LIB=/usr/local/share/boost
BOOST_VERSIONS=$(cat toolset.json | jq -r 'to_entries[] | select(.key | match("boost")) | .value[] +".0"')
# Install Boost # Install Boost
for BOOST_VERSION in ${BOOST_VERSIONS//,/ } for BOOST_VERSION in ${BOOST_VERSIONS}
do do
BOOST_SYMLINK_VER=`echo "${BOOST_VERSION//[.]/_}"` BOOST_SYMLINK_VER=$(echo "${BOOST_VERSION//[.]/_}")
BOOST_ROOT="BOOST_ROOT_$BOOST_SYMLINK_VER" BOOST_ROOT_VERSION="BOOST_ROOT_$BOOST_SYMLINK_VER"
echo "$BOOST_ROOT=$BOOST_LIB/$BOOST_VERSION" | tee -a /etc/environment
if [[ $BOOST_VERSION == $BOOST_DEFAULT ]]; then
echo "BOOST_ROOT=$BOOST_LIB/$BOOST_VERSION" | tee -a /etc/environment
fi
echo "$BOOST_ROOT_VERSION=$BOOST_LIB/$BOOST_VERSION" | tee -a /etc/environment
DocumentInstalledItem "Boost C++ Libraries $BOOST_VERSION" DocumentInstalledItem "Boost C++ Libraries $BOOST_VERSION"
done done

3
images/linux/ubuntu1604.json
View File

@@ -240,8 +240,7 @@
"environment_vars": [ "environment_vars": [
"METADATA_FILE={{user `metadata_file`}}", "METADATA_FILE={{user `metadata_file`}}",
"HELPER_SCRIPTS={{user `helper_script_folder`}}", "HELPER_SCRIPTS={{user `helper_script_folder`}}",
"BOOST_VERSIONS=1.69.0", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}"
"BOOST_DEFAULT=1.69.0"
], ],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
}, },

3
images/linux/ubuntu1804.json
View File

@@ -242,8 +242,7 @@
"environment_vars": [ "environment_vars": [
"METADATA_FILE={{user `metadata_file`}}", "METADATA_FILE={{user `metadata_file`}}",
"HELPER_SCRIPTS={{user `helper_script_folder`}}", "HELPER_SCRIPTS={{user `helper_script_folder`}}",
"BOOST_VERSIONS=1.69.0", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}"
"BOOST_DEFAULT=1.69.0"
], ],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
}, },