Base LLVM repo setup on toolset version

Author: grisumbras

.github/actions/setup-packages/action.yml

@@ -13,12 +13,12 @@ inputs:
     description: Extra package repositories to use
     required: false
     default: ''
-  llvm_version:
-    description: LLVM version to install
+  toolset:
+    description: B2 toolset module to target
     required: false
     default: ''
-  os:
-    description: OS to install LLVM packages for
+  version:
+    description: B2 toolset module version to target
     required: false
     default: ''
 runs:
@@ -28,7 +28,7 @@ runs:
       shell: bash
       env:
         LLVM_OS: ${{ inputs.os }}
-        LLVM_VER: ${{ inputs.llvm_version }}
+        LLVM_VER: ${{ inputs.version }}
         PACKAGES: ${{ inputs.install }}
         PACKAGES_TO_REMOVE: ${{ inputs.remove }}
       run: |
@@ -37,14 +37,14 @@ runs:
         echo ">>>>> APT: REPO.."
         for i in {1..3}; do sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" && break || sleep 2; done
 
-        if test -n "${LLVM_OS}" ; then
+        if [ clang = "${{ inputs.toolset }}" ]; then
+            . /etc/lsb-release
             wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-            if test -n "${LLVM_VER}" ; then
-                sudo -E apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS}-${LLVM_VER} main"
-            else
-                # Snapshot (i.e. trunk) build of clang
-                sudo -E apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS} main"
+            LLVM_DISTRIB=llvm-toolchain-${DISTRIB_CODENAME}
+            if test -n "${{ inputs.llvm_version }}" ; then
+                LLVM_DISTRIB=${LLVM_DISTRIB}-${{ inputs.llvm_version }}
             fi
+            sudo -E apt-add-repository "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ ${LLVM_DISTRIB} main"
         fi
         echo ">>>>> APT: UPDATE.."
         sudo -E apt-get -o Acquire::Retries=3 update

.github/workflows/ci.yml

@@ -41,8 +41,6 @@ jobs:
             os: "ubuntu-18.04"
             toolset: "clang"
             toolset_version: "6.0"
-            llvm_os: "bionic"
-            llvm_ver: "6.0"
             comment: "valgrind"
             b2_cxxstd: "11,14"
             b2_defines: "BOOST_NO_STRESS_TEST=1"
@@ -55,8 +53,6 @@ jobs:
             os: "ubuntu-18.04"
             toolset: "clang"
             toolset_version: "11"
-            llvm_os: "bionic"
-            llvm_ver: "11"
             comment: "asan"
             b2_variant: "debug"
             b2_cxxstd: "17"
@@ -68,8 +64,6 @@ jobs:
             os: "ubuntu-18.04"
             toolset: "clang"
             toolset_version: "11"
-            llvm_os: "xenial"
-            llvm_ver: "11"
             comment: "ubsan"
             b2_variant: "debug"
             b2_cxxstd: "17"
@@ -168,8 +162,6 @@ jobs:
             container: "ubuntu:16.04"
             toolset: "clang"
             toolset_version: "4.0"
-            llvm_os: "xenial"
-            llvm_ver: "4.0"
             b2_cxxstd: "11,14"
           - name: "B2_TOOLSET=clang-5.0 B2_CXXSTD=11,14 Job 21"
             buildtype: "boost"
@@ -178,8 +170,6 @@ jobs:
             container: "ubuntu:16.04"
             toolset: "clang"
             toolset_version: "5.0"
-            llvm_os: "xenial"
-            llvm_ver: "5.0"
             b2_cxxstd: "11,14"
           - name: "B2_TOOLSET=clang-6.0 B2_CXXSTD=14,17 Job 22"
             buildtype: "boost"
@@ -188,8 +178,6 @@ jobs:
             container: "ubuntu:16.04"
             toolset: "clang"
             toolset_version: "6.0"
-            llvm_os: "xenial"
-            llvm_ver: "6.0"
             b2_cxxstd: "14,17"
           - name: "B2_TOOLSET=clang-7 B2_CXXSTD=17 Job 23"
             buildtype: "boost"
@@ -198,8 +186,6 @@ jobs:
             container: "ubuntu:16.04"
             toolset: "clang"
             toolset_version: "7"
-            llvm_os: "xenial"
-            llvm_ver: "7"
             b2_cxxstd: "17"
           - name: "B2_TOOLSET=clang-8 B2_CXXSTD=17 Job 24"
             buildtype: "boost"
@@ -208,8 +194,6 @@ jobs:
             container: "ubuntu:16.04"
             toolset: "clang"
             toolset_version: "8"
-            llvm_os: "xenial"
-            llvm_ver: "8"
             b2_cxxstd: "17"
           - name: "B2_TOOLSET=clang-9 B2_CXXSTD=17,2a Job 25"
             buildtype: "boost"
@@ -218,8 +202,6 @@ jobs:
             container: "ubuntu:16.04"
             toolset: "clang"
             toolset_version: "9"
-            llvm_os: "xenial"
-            llvm_ver: "9"
             b2_cxxstd: "17,2a"
           - name: "COMMENT=standalone CXX=clang++-9 Job 26"
             buildtype: "standalone"
@@ -228,44 +210,34 @@ jobs:
             container: "ubuntu:16.04"
             toolset: "clang"
             toolset_version: "9"
-            llvm_os: "xenial"
-            llvm_ver: "9"
             comment: "standalone"
           - name: "B2_TOOLSET=clang-10 B2_CXXSTD=17,2a Job 27"
             buildtype: "boost"
             packages: "clang-10 libstdc++-9-dev"
             os: "ubuntu-18.04"
             toolset: "clang"
             toolset_version: "10"
-            llvm_os: "xenial"
-            llvm_ver: "10"
             b2_cxxstd: "17,2a"
           - name: "COMMENT=standalone CXX=clang++-10 Job 28"
             buildtype: "standalone"
             packages: "clang-10 libstdc++-9-dev"
             os: "ubuntu-18.04"
             toolset: "clang"
             toolset_version: "10"
-            llvm_os: "xenial"
-            llvm_ver: "10"
             comment: "standalone"
           - name: "B2_TOOLSET=clang-11 B2_CXXSTD=17,2a Job 29"
             buildtype: "boost"
             packages: "clang-11 libstdc++-9-dev"
             os: "ubuntu-18.04"
             toolset: "clang"
             toolset_version: "11"
-            llvm_os: "xenial"
-            llvm_ver: "11"
             b2_cxxstd: "17,2a"
           - name: "COMMENT=standalone CXX=clang++-11 Job 30"
             buildtype: "standalone"
             packages: "clang-11 libstdc++-9-dev"
             os: "ubuntu-18.04"
             toolset: "clang"
             toolset_version: "11"
-            llvm_os: "xenial"
-            llvm_ver: "11"
             comment: "standalone"
           - name: "COMMENT=Coverity Scan B2_TOOLSET=clang Job 31"
             buildtype: "coverity"
@@ -312,8 +284,8 @@ jobs:
       - uses: ./.github/actions/setup-packages
         with:
           install: ${{ matrix.packages }}
-          os: ${{ matrix.llvm_os }}
-          llvm_version: ${{ matrix.llvm_ver }}
+          toolset: ${{ matrix.toolset }}
+          llvm_version: ${{ matrix.toolset_version }}
 
       - uses: ./.github/actions/build
         with: