Skip to content

Commit 19e9712

Browse files
firewavefirewave
authored
install latest clang from apt.llvm.org repo instead of relying on distro packages - eliminates need for docker images (#4372)
1 parent 0cf174e commit 19e9712

4 files changed

Lines changed: 34 additions & 27 deletions

File tree

‎.github/workflows/asan.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ jobs:
99

1010
runs-on: ubuntu-22.04
1111

12-
container:
13-
image: "ubuntu:22.04"
14-
1512
env:
1613
ASAN_OPTIONS: detect_stack_use_after_return=1
1714

@@ -25,9 +22,14 @@ jobs:
2522

2623
- name: Install missing software on ubuntu
2724
run: |
28-
apt-get update
29-
apt-get install -y cmake make libpcre3-dev
30-
apt-get install -y clang-14
25+
sudo apt-get update
26+
sudo apt-get install -y cmake make libpcre3-dev
27+
28+
- name: Install clang
29+
run: |
30+
wget https://apt.llvm.org/llvm.sh
31+
chmod +x llvm.sh
32+
sudo ./llvm.sh 14
3133
3234
- name: CMake
3335
run: |

‎.github/workflows/clang-tidy.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ jobs:
99

1010
runs-on: ubuntu-22.04
1111

12-
container:
13-
image: "ubuntu:22.04"
14-
1512
env:
1613
QT_VERSION: 5.15.2
1714

@@ -20,11 +17,16 @@ jobs:
2017

2118
- name: Install missing software
2219
run: |
23-
apt-get update
24-
apt-get install -y cmake clang-14 make
25-
apt-get install -y libpcre3-dev
26-
apt-get install -y libffi7 # work around missing dependency for Qt install step
27-
apt-get install -y clang-tidy-14
20+
sudo apt-get update
21+
sudo apt-get install -y cmake make
22+
sudo apt-get install -y libpcre3-dev
23+
sudo apt-get install -y libffi7 # work around missing dependency for Qt install step
24+
25+
- name: Install clang
26+
run: |
27+
wget https://apt.llvm.org/llvm.sh
28+
chmod +x llvm.sh
29+
sudo ./llvm.sh 14
2830
2931
- name: Cache Qt ${{ env.QT_VERSION }}
3032
id: cache-qt
@@ -36,7 +38,6 @@ jobs:
3638
- name: Install Qt ${{ env.QT_VERSION }}
3739
uses: jurplel/install-qt-action@v2
3840
with:
39-
install-deps: 'nosudo'
4041
version: ${{ env.QT_VERSION }}
4142
modules: 'qtcharts'
4243
cached: ${{ steps.cache-qt.outputs.cache-hit }}

‎.github/workflows/tsan.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ jobs:
1212
env:
1313
TSAN_OPTIONS: halt_on_error=1
1414

15-
container:
16-
image: "ubuntu:22.04"
17-
1815
steps:
1916
- uses: actions/checkout@v2
2017

@@ -25,9 +22,14 @@ jobs:
2522

2623
- name: Install missing software on ubuntu
2724
run: |
28-
apt-get update
29-
apt-get install -y cmake make libpcre3-dev
30-
apt-get install -y clang-14
25+
sudo apt-get update
26+
sudo apt-get install -y cmake make libpcre3-dev
27+
28+
- name: Install clang
29+
run: |
30+
wget https://apt.llvm.org/llvm.sh
31+
chmod +x llvm.sh
32+
sudo ./llvm.sh 14
3133
3234
- name: CMake
3335
run: |

‎.github/workflows/ubsan.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ jobs:
99

1010
runs-on: ubuntu-22.04
1111

12-
container:
13-
image: "ubuntu:22.04"
14-
1512
env:
1613
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
1714

@@ -25,9 +22,14 @@ jobs:
2522

2623
- name: Install missing software on ubuntu
2724
run: |
28-
apt-get update
29-
apt-get install -y cmake make libpcre3-dev
30-
apt-get install -y clang-14
25+
sudo apt-get update
26+
sudo apt-get install -y cmake make libpcre3-dev
27+
28+
- name: Install clang
29+
run: |
30+
wget https://apt.llvm.org/llvm.sh
31+
chmod +x llvm.sh
32+
sudo ./llvm.sh 14
3133
3234
- name: CMake
3335
run: |

0 commit comments

Comments
 (0)