ci(docker-build): clean up llvm setup so it's using the correct version

vpayno · Jun 22, 2024 · a8d95f5 · a8d95f5
1 parent 10af6c3
commit a8d95f5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/.github/docker/layer-10.00-exercism-gcc_clang_llvm.sh b/.github/docker/layer-10.00-exercism-gcc_clang_llvm.sh
@@ -44,7 +44,7 @@ main() {
 		libc++abi-"${LLVM_VER}"-dev
 		libc++-"${LLVM_VER}"-dev
 		libfuzzer-"${LLVM_VER}"-dev
-		libllvm16
+		libllvm"${LLVM_VER}"
 		libllvm-"${LLVM_VER}"-ocaml-dev
 		libssl-dev
 		libunwind-"${LLVM_VER}"-dev
@@ -60,7 +60,7 @@ main() {
 
 	# wget -q https://apt.llvm.org/llvm.sh
 	# chmod -v +x llvm.sh
-	# ./llvm.sh 16 all
+	# ./llvm.sh "${LLVM_VER}" all
 
 	echo Creating /etc/apt/sources.list.d/llvm.list
 	tee -a /etc/apt/sources.list.d/llvm.list <<-EOF

diff --git a/.github/docker/layer-15.00-exercism-rust.sh b/.github/docker/layer-15.00-exercism-rust.sh
@@ -29,7 +29,7 @@ main() {
 		gcovr
 		lcov
 		libllvm-"${LLVM_VER}"-ocaml-dev
-		libllvm16
+		libllvm"${LLVM_VER}"
 		libssl-dev
 		lld-"${LLVM_VER}"
 		llvm-"${LLVM_VER}"

diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
@@ -66,21 +66,22 @@ jobs:
       - name: Install C Tools
         id: install-c-tools
         run: |
+          source .github/citools/includes/wrapper-library
           sudo tee -a /etc/apt/sources.list <<EOF
           # deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main
           # deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy main
           # deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main
           # deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main
           # deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main
           # deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main
-          deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main
-          deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main
+          deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-"${LLVM_VER}" main
+          deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-"${LLVM_VER}" main
           EOF
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
           sudo apt update
-          # sudo apt install -y clang-16 lldb-16 lld-16
+          # sudo apt install -y clang-"${LLVM_VER}" lldb-"${LLVM_VER}" lld-"${LLVM_VER}"
           # sudo apt install -y libllvm-14-ocaml-dev libllvm14 llvm-14 llvm-14-dev llvm-14-doc llvm-14-examples llvm-14-runtime
-          sudo apt install -y gcc clang-16 clang-tools-16 clang-tidy-16
+          sudo apt install -y gcc clang-"${LLVM_VER}" clang-tools-"${LLVM_VER}" clang-tidy-"${LLVM_VER}"
           # sudo apt install -y libssl-dev
           # sudo apt install -y lcov
           sudo apt install -y make
@@ -93,12 +94,12 @@ jobs:
           pwd
           ls
       - name: Analysing the code with clang-check
-        id: clang-check-16
+        id: clang-check
         run: |
           cd ./c
           ./for_each ../../.github/citools/c/clang-check
-      - name: Analysing the code clang-tidy-16
-        id: clang-tidy-16
+      - name: Analysing the code clang-tidy
+        id: clang-tidy
         run: |
           cd ./c
           ./for_each ../../.github/citools/c/clang-tidy

diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -49,7 +49,6 @@ jobs:
             printf "%s\n" "${GIT_DIFF}"
             printf "\`\`\`\n"
           } | tee -a "${GITHUB_STEP_SUMMARY}"
-
           HAS_WF_DIFF=false
           HAS_EX_DIFF=false
           if printf "%s\n" "${GIT_DIFF}" | grep -E '^(.github/workflows/cpp.yml|.github/citools/cpp/)$'; then
@@ -174,6 +173,7 @@ jobs:
       - name: Install C++ Tools [${{ matrix.exercise }}]
         id: install-c-tools
         run: |
+          source .github/citools/includes/wrapper-library
           if ! grep -q llvm.org /etc/apt/sources.list; then
             sudo tee -a /etc/apt/sources.list <<EOF
           # deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main
@@ -182,15 +182,15 @@ jobs:
           # deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main
           # deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main
           # deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main
-          deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main
-          deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main
+          deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VER} main
+          deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VER} main
           EOF
             wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
           fi
           sudo apt update
           # sudo apt install -y clang-16 lldb-16 lld-16
           # sudo apt install -y libllvm-14-ocaml-dev libllvm14 llvm-14 llvm-14-dev llvm-14-doc llvm-14-examples llvm-14-runtime
-          sudo apt install -y g++ clang-16 clang-tools-16 clang-tidy-16 cmake gcovr
+          sudo apt install -y g++ clang-"${LLVM_VER}" clang-tools-"${LLVM_VER}" clang-tidy-"${LLVM_VER}" cmake gcovr
           sudo apt install -y g++ gcovr
           sudo apt install -y g++ cmake
           # sudo apt install -y libssl-dev
@@ -207,7 +207,7 @@ jobs:
           ls
           ls
       - name: Analysing the code with clang-check [${{ matrix.exercise }}]
-        id: clang-check-16
+        id: clang-check
         run: |
           pwd
           cd "./${{ matrix.exercise }}"
@@ -219,8 +219,8 @@ jobs:
             ../../.github/citools/cpp/clang-check
             printf "\`\`\`\n"
           } | tee -a "${GITHUB_STEP_SUMMARY}"
-      - name: Analysing the code clang-tidy-16 [${{ matrix.exercise }}]
-        id: clang-tidy-16
+      - name: Analysing the code clang-tidy [${{ matrix.exercise }}]
+        id: clang-tidy
         run: |
           pwd
           cd "./${{ matrix.exercise }}"