Skip to content

Commit fe1b139

Browse files
trxcllntNo9
authored andcommitted
install lldb without prefix when using llvm apt repos
1 parent 62def82 commit fe1b139

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

.github/workflows/push.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
if: startsWith(matrix.os, 'ubuntu-')
4444
run: |
4545
use_llvm_repos=0
46+
lldb_pkg="lldb-${{ matrix.llvm }}"
4647
4748
case "${{ matrix.os }}-${{ matrix.llvm }}" in
4849
ubuntu18.04-10) use_llvm_repos=1;;
@@ -56,6 +57,7 @@ jobs:
5657
esac
5758
5859
if [[ ${use_llvm_repos} == 1 ]]; then
60+
lldb_pkg="lldb";
5961
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -;
6062
release="$(lsb_release -cs)"
6163
cat << EOF | sudo tee /etc/apt/sources.list.d/llvm-${{ matrix.llvm }}.list
@@ -65,8 +67,10 @@ jobs:
6567
fi
6668
6769
sudo apt-get -qq update
68-
sudo apt-get install lldb-${{ matrix.llvm }} liblldb-${{ matrix.llvm }}-dev lcov gdb -y
69-
sudo ln -s $(which lldb-${{ matrix.llvm }}) /usr/bin/lldb
70+
sudo apt-get install ${lldb_pkg} lib${lldb_pkg}-dev lcov gdb -y
71+
if [[ -z "$(which lldb-${{ matrix.llvm }})" ]]; then
72+
sudo ln -s "$(which lldb-${{ matrix.llvm }})" /usr/bin/lldb
73+
fi
7074
- name: npm install
7175
run: |
7276
npm install --llnode_build_addon=true --llnode_coverage=true

0 commit comments

Comments
 (0)