43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
|
From 3f2e5cdddd0a11947b493143fbf2ac3c18c9a082 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
||
|
|
Date: Thu, 27 Jul 2023 13:20:17 +0200
|
||
|
|
Subject: [PATCH] ci: explicitly install python3-lldb-$COMPILER_VERSION
|
||
|
|
|
||
|
|
To avoid apt complaining:
|
||
|
|
|
||
|
|
+ apt-get -y install clang-15 lldb-15 lld-15 clangd-15
|
||
|
|
Reading package lists...
|
||
|
|
Building dependency tree...
|
||
|
|
Reading state information...
|
||
|
|
Some packages could not be installed. This may mean that you have
|
||
|
|
requested an impossible situation or if you are using the unstable
|
||
|
|
distribution that some required packages have not yet been created
|
||
|
|
or been moved out of Incoming.
|
||
|
|
The following information may help to resolve the situation:
|
||
|
|
|
||
|
|
The following packages have unmet dependencies:
|
||
|
|
python3-lldb-14 : Conflicts: python3-lldb-x.y
|
||
|
|
python3-lldb-15 : Conflicts: python3-lldb-x.y
|
||
|
|
E: Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages.
|
||
|
|
|
||
|
|
(cherry picked from commit c5afbac31bb33e7b1f4d59b253425af991a630a4)
|
||
|
|
|
||
|
|
Related: #2225667
|
||
|
|
---
|
||
|
|
.github/workflows/build_test.sh | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh
|
||
|
|
index b60db29efc..745d2e5cbd 100755
|
||
|
|
--- a/.github/workflows/build_test.sh
|
||
|
|
+++ b/.github/workflows/build_test.sh
|
||
|
|
@@ -86,7 +86,7 @@ if [[ "$COMPILER" == clang ]]; then
|
||
|
|
"$RELEASE" "$RELEASE" "$COMPILER_VERSION" >/etc/apt/sources.list.d/llvm-toolchain.list
|
||
|
|
fi
|
||
|
|
|
||
|
|
- PACKAGES+=("clang-$COMPILER_VERSION" "lldb-$COMPILER_VERSION" "lld-$COMPILER_VERSION" "clangd-$COMPILER_VERSION")
|
||
|
|
+ PACKAGES+=("clang-$COMPILER_VERSION" "lldb-$COMPILER_VERSION" "python3-lldb-$COMPILER_VERSION" "lld-$COMPILER_VERSION" "clangd-$COMPILER_VERSION")
|
||
|
|
elif [[ "$COMPILER" == gcc ]]; then
|
||
|
|
CC="gcc-$COMPILER_VERSION"
|
||
|
|
CXX="g++-$COMPILER_VERSION"
|