Skip to content

Commit 881e45d

Browse files
committed
[ot] .github: update LLVM tools to version 17 and use OT scripts
Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
1 parent d833443 commit 881e45d

File tree

1 file changed

+34
-28
lines changed

1 file changed

+34
-28
lines changed

.github/workflows/build_test.yaml

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
---
12
#------------------------------------------------------------------------------
23
# QEMU OpenTitan CI
34
#
4-
# Copyright (c) 2023 Rivos, Inc.
5+
# Copyright (c) 2023-2024 Rivos, Inc.
56
# SPDX-License-Identifier: Apache License 2.0
67
#------------------------------------------------------------------------------
78

@@ -12,12 +13,13 @@ jobs:
1213
runs-on: ubuntu-latest
1314
steps:
1415
- name: Install deps
15-
run: wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key |
16-
sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc &&
17-
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" &&
18-
sudo apt-get update &&
19-
sudo apt-get install -y git make pkg-config clang-16 cmake ninja-build python3 rust-all
20-
libpixman-1-dev
16+
run: |
17+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key |
18+
sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc &&
19+
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" &&
20+
sudo apt-get update &&
21+
sudo apt-get install -y git make pkg-config clang-17 cmake ninja-build python3 rust-all
22+
libpixman-1-dev
2123
- name: Check out QEMU
2224
uses: actions/checkout@v4
2325
- name: Configure
@@ -26,7 +28,7 @@ jobs:
2628
git clean -dffx subprojects
2729
mkdir build-clang
2830
(cd build-clang &&
29-
../configure --cc=clang-16 --disable-werror --target-list=riscv32-softmmu,riscv64-softmmu)
31+
../configure --cc=clang-17 --disable-werror --target-list=riscv32-softmmu,riscv64-softmmu)
3032
- name: Build
3133
run: |
3234
ninja -C build-clang &&
@@ -64,11 +66,12 @@ jobs:
6466
runs-on: ubuntu-latest
6567
steps:
6668
- name: Install tools
67-
run: wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key |
68-
sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc &&
69-
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" &&
70-
sudo apt-get update &&
71-
sudo apt-get install -y clang-format-16
69+
run: |
70+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key |
71+
sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc &&
72+
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" &&
73+
sudo apt-get update &&
74+
sudo apt-get install -y clang-format-17
7275
- name: Check out QEMU
7376
uses: actions/checkout@v4
7477
- name: Check execution
@@ -80,17 +83,18 @@ jobs:
8083
needs: build-clang
8184
steps:
8285
- name: Install tools
83-
run: wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key |
84-
sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc &&
85-
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" &&
86-
sudo apt-get update &&
87-
sudo apt-get install -y clang-tidy-16
86+
run: |
87+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key |
88+
sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc &&
89+
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" &&
90+
sudo apt-get update &&
91+
sudo apt-get install -y clang-tidy-17
8892
- name: Check out QEMU
8993
uses: actions/checkout@v4
9094
- name: Download QEMU source artifacts
9195
uses: actions/download-artifact@v3
9296
with:
93-
name: qemu-src
97+
name: qemu-src
9498
- name: Unpack source artifacts
9599
run: |
96100
tar xzf qemu-src-artifact.tar.gz
@@ -104,12 +108,13 @@ jobs:
104108
needs: build-clang
105109
steps:
106110
- name: Install tools
107-
run: sudo apt-get update &&
108-
sudo apt-get install -y libpixman-1-0
111+
run: |
112+
sudo apt-get update &&
113+
sudo apt-get install -y libpixman-1-0
109114
- name: Download QEMU binary artifacts
110115
uses: actions/download-artifact@v3
111116
with:
112-
name: qemu-bin
117+
name: qemu-bin
113118
- name: Check machine availability
114119
run: |
115120
chmod +x ./qemu-system-riscv32 &&
@@ -129,12 +134,13 @@ jobs:
129134
runs-on: ubuntu-latest
130135
steps:
131136
- name: Install tools
132-
run: wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key |
133-
sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc &&
134-
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" &&
135-
sudo apt-get update &&
136-
sudo apt-get install -y git make pkg-config gcc cmake ninja-build
137-
python3 rust-all libpixman-1-dev
137+
run: |
138+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key |
139+
sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc &&
140+
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" &&
141+
sudo apt-get update &&
142+
sudo apt-get install -y git make pkg-config gcc cmake ninja-build
143+
python3 rust-all libpixman-1-dev
138144
- name: Check out QEMU
139145
uses: actions/checkout@v4
140146
- name: Configure

0 commit comments

Comments
 (0)