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

[Ubuntu] Reworked clang installation to use default Ubuntu repo (#3834)

Browse Source
This commit is contained in:
Leonid Lapshin
2021-08-04 10:45:59 +03:00
committed by GitHub
parent b36d7c3960
commit e7ca52b564
3 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
images/linux/scripts/installers/clang.sh
View File

@@ -5,21 +5,13 @@
################################################################################
# Source the helpers for use with the script
source $HELPER_SCRIPTS/os.sh
source $HELPER_SCRIPTS/install.sh
function InstallClang {
local version=$1
echo "Installing clang-$version..."
if [[ $version =~ 9 ]] && isUbuntu16 || [[ $version =~ 12 ]]; then
./llvm.sh $version
apt-get install -y "clang-format-$version"
llvm_repo=$(grep '^deb.*apt.llvm.org\/' /etc/apt/sources.list)
echo "llvm $llvm_repo" >> $HELPER_SCRIPTS/apt-sources.txt
else
apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version"
fi
apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version"
}
function SetDefaultClang {
@@ -31,10 +23,6 @@ function SetDefaultClang {
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-${version} 100
}
# Download script for automatic installation
download_with_retries https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
versions=$(get_toolset_value '.clang.versions[]')
default_clang_version=$(get_toolset_value '.clang.default_version')
@@ -43,9 +31,8 @@ for version in ${versions[*]}; do
InstallClang $version
fi
done
InstallClang $default_clang_version
InstallClang $default_clang_version
SetDefaultClang $default_clang_version
rm llvm.sh
invoke_tests "Tools" "clang"