]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
ci: use the system llvm-11 package on Focal
authorFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 11 Oct 2021 19:12:42 +0000 (21:12 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 12 Oct 2021 06:17:56 +0000 (08:17 +0200)
ATTOW llvm-11 got into focal-updates, which conflicts with llvm-11
provided by the apt.llvm.org repositories. Let's use the system
llvm package if available in such cases to avoid that.

.github/workflows/build_test.sh

index 89d2f85cfbc885e42309599bd834d798ee77ebc0..9f4ef79bbb8414afeba3a41d4a87918b578d31bc 100755 (executable)
@@ -72,11 +72,17 @@ if [[ "$COMPILER" == clang ]]; then
     CC="clang-$COMPILER_VERSION"
     CXX="clang++-$COMPILER_VERSION"
     AR="llvm-ar-$COMPILER_VERSION"
-    # Latest LLVM stack deb packages provided by https://apt.llvm.org/
-    # Following snippet was borrowed from https://apt.llvm.org/llvm.sh
-    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-    add-apt-repository -y "deb http://apt.llvm.org/$RELEASE/   llvm-toolchain-$RELEASE-$COMPILER_VERSION  main"
-    PACKAGES+=("clang-$COMPILER_VERSION" "lldb-$COMPILER_VERSION" "lld-$COMPILER_VERSION" "clangd-$COMPILER_VERSION")
+
+    # ATTOW llvm-11 got into focal-updates, which conflicts with llvm-11
+    # provided by the apt.llvm.org repositories. Let's use the system
+    # llvm package if available in such cases to avoid that.
+    if ! apt show --quiet "llvm-$COMPILER_VERSION" &>/dev/null; then
+        # Latest LLVM stack deb packages provided by https://apt.llvm.org/
+        # Following snippet was borrowed from https://apt.llvm.org/llvm.sh
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
+        add-apt-repository -y "deb http://apt.llvm.org/$RELEASE/   llvm-toolchain-$RELEASE-$COMPILER_VERSION  main"
+        PACKAGES+=("clang-$COMPILER_VERSION" "lldb-$COMPILER_VERSION" "lld-$COMPILER_VERSION" "clangd-$COMPILER_VERSION")
+    fi
 elif [[ "$COMPILER" == gcc ]]; then
     CC="gcc-$COMPILER_VERSION"
     CXX="g++-$COMPILER_VERSION"