From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Mon, 10 Oct 2022 13:34:35 +0000 (+0100)
Subject: CI: use vars to set llvm/gcc versions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6de0d5e684e5456a6830be5d0bf3026040c52052;p=thirdparty%2Ffreeradius-server.git

CI: use vars to set llvm/gcc versions
---

diff --git a/.github/actions/build-freeradius/action.yml b/.github/actions/build-freeradius/action.yml
index ba4edb3fd1c..3e00a640fa5 100644
--- a/.github/actions/build-freeradius/action.yml
+++ b/.github/actions/build-freeradius/action.yml
@@ -4,6 +4,12 @@ inputs:
   use_docker:
     desription: True if running in a Docker container
     default: false
+  llvm_ver:
+    desription: Version of LLVM to use
+    default: 12
+  gcc_ver:
+    desription: Version of GCC to use
+    default: 11
 
 
 runs:
@@ -124,20 +130,20 @@ runs:
       run: |
         pip3 install tacacs_plus
 
-    - name: Install LLVM 12
+    - name: Install LLVM ${{ inputs.llvm_ver }}
       if: ${{ matrix.env.CC == 'clang' && runner.os != 'macOS' }}
       shell: bash
       run: |
-        sudo apt-get install -y --no-install-recommends clang-12 llvm-12 gdb lldb
-        sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 60 && sudo update-alternatives --set clang /usr/bin/clang-12
-        sudo update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-12 60 && sudo update-alternatives --set llvm-symbolizer /usr/bin/llvm-symbolizer-12
+        sudo apt-get install -y --no-install-recommends clang-${{ inputs.llvm_ver }} llvm-${{ inputs.llvm_ver }} gdb lldb
+        sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ inputs.llvm_ver }} 60 && sudo update-alternatives --set clang /usr/bin/clang-${{ inputs.llvm_ver }}
+        sudo update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-${{ inputs.llvm_ver }} 60 && sudo update-alternatives --set llvm-symbolizer /usr/bin/llvm-symbolizer-${{ inputs.llvm_ver }}
 
-    - name: Set compiler to GCC 11
+    - name: Set compiler to GCC ${{ inputs.gcc_ver }}
       if: ${{ matrix.env.CC == 'gcc' }}
       shell: bash
       run: |
-        sudo apt-get install -y --no-install-recommends gcc-11 gdb lldb
-        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 60 && sudo update-alternatives --set gcc /usr/bin/gcc-11
+        sudo apt-get install -y --no-install-recommends gcc-${{ inputs.gcc_ver }} gdb lldb
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc_ver }} 60 && sudo update-alternatives --set gcc /usr/bin/gcc-${{ inputs.gcc_ver }}
 
     #
     #  Ensure the homebrew version of clang is run rather than the Apple compiler.