Add Clang 12 to Ubuntu 20.04 toolset (actions#3206)

* Add Clang 12 to Ubuntu 20.04 toolset * Ubuntu: Install Clang-12 directly from LLVM
dmitry-shibanov · May 13, 2021 · 0985500 · 0985500
1 parent 75a4d89
commit 0985500
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh
@@ -12,7 +12,7 @@ function InstallClang {
     local version=$1
 
     echo "Installing clang-$version..."
-    if [[ $version =~ 9 ]] && isUbuntu16; then
+    if [[ $version =~ 9 ]] && isUbuntu16 || [[ $version =~ 12 ]]; then
         ./llvm.sh $version
         apt-get install -y "clang-format-$version"
     else
@@ -43,4 +43,4 @@ done
 SetDefaultClang $default_clang_version
 rm llvm.sh
 
-invoke_tests "Tools" "clang"
+invoke_tests "Tools" "clang"
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
@@ -247,7 +247,8 @@
         "versions": [
             "9",
             "10",
-            "11"
+            "11",
+            "12"
         ],
         "default_version": "10"
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -247,7 +247,8 @@ @@
             "versions": [
                 "9",
                 "10",
-                "11"
+                "11",
+                "12"
             ],
             "default_version": "10"
         },
@@ Expand Down @@