Skip to content

Commit 398104c

Browse files
authored
CI: try to speedup by avoiding unnecessary installs (#3144)
* Start removing non-apt deps GH images come with baked-in software that doesn't come from apt, getting the apt version will just slow down CI since the baked in version will be used anyway. * Do not install llvm-X if already there * Do not remove old llvm-X Est-ce qu'ils nous derangent ? * default llvm install is missing stuff * CLang is already baked-in * Set installed clang as default * Move ARM deps to qemu fuzzers
1 parent 7680ea1 commit 398104c

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,6 @@ jobs:
171171
runs-on: ubuntu-24.04
172172
needs: ubuntu
173173
steps:
174-
- name: Install curl
175-
run: sudo apt-get update && sudo apt-get install clang
176174
- uses: dtolnay/rust-toolchain@stable
177175
- uses: actions/checkout@v4
178176
- uses: Swatinem/rust-cache@v2
@@ -186,7 +184,7 @@ jobs:
186184
runs-on: ubuntu-24.04
187185
steps:
188186
- name: Install deps
189-
run: sudo apt-get update && sudo apt-get install -y lsb-release wget software-properties-common gnupg ninja-build python3-dev python3-pip python3-venv libz3-dev
187+
run: sudo apt-get update && sudo apt-get install -y lsb-release wget software-properties-common gnupg libz3-dev
190188
- name: Install maturin
191189
run: cargo install --locked maturin
192190
- uses: actions/checkout@v4
@@ -610,8 +608,6 @@ jobs:
610608
android:
611609
runs-on: ubuntu-24.04
612610
steps:
613-
- name: Install curl
614-
run: sudo apt-get update && sudo apt-get install clang
615611
- uses: dtolnay/rust-toolchain@stable
616612
- uses: nttld/setup-ndk@v1
617613
with:

.github/workflows/qemu-fuzzer-tester-prepare/action.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ runs:
55
steps:
66
- name: Install QEMU deps
77
shell: bash
8-
run: apt-get update && apt-get install -y qemu-utils sudo python3-msgpack python3-jinja2 curl python3-dev
8+
run: |
9+
apt-get update
10+
apt-get install -y qemu-utils sudo python3-msgpack python3-jinja2 curl python3-dev gcc-arm-none-eabi \
11+
gcc-arm-linux-gnueabi g++-arm-linux-gnueabi
912
- uses: dtolnay/rust-toolchain@stable
1013
- name: enable mult-thread for `make`
1114
shell: bash

.github/workflows/ubuntu-prepare/action.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ runs:
55
steps:
66
- name: Install and cache deps
77
shell: bash
8-
run: sudo apt-get update && sudo apt-get install -y curl lsb-release wget software-properties-common gnupg ninja-build shellcheck pax-utils nasm libsqlite3-dev libc6-dev libgtk-3-dev gcc g++ gcc-arm-none-eabi gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libslirp-dev libz3-dev build-essential
8+
run: |
9+
sudo apt-get update
10+
sudo apt-get install -y curl lsb-release wget software-properties-common gnupg shellcheck pax-utils \
11+
nasm libsqlite3-dev libc6-dev libgtk-3-dev gcc g++ libslirp-dev libz3-dev build-essential \
912
- uses: dtolnay/rust-toolchain@stable
1013
- name: install just
1114
uses: extractions/setup-just@v2
@@ -17,9 +20,6 @@ runs:
1720
- name: Add nightly clippy
1821
shell: bash
1922
run: rustup toolchain install nightly --component clippy --allow-downgrade
20-
- name: Remove existing clang and LLVM
21-
shell: bash
22-
run: sudo apt-get purge -y *llvm* *clang* lld* lldb* opt*
2323
- name: Install cargo-hack
2424
shell: bash
2525
run: curl -LsSf https://github.com/taiki-e/cargo-hack/releases/latest/download/cargo-hack-x86_64-unknown-linux-gnu.tar.gz | tar xzf - -C ~/.cargo/bin
@@ -29,12 +29,13 @@ runs:
2929
- name: Default to nightly
3030
shell: bash
3131
run: rustup default nightly
32-
- name: Add LLVM in sources list
32+
- name: Install LLVM
3333
shell: bash
3434
run: |
3535
wget https://apt.llvm.org/llvm.sh
3636
chmod +x llvm.sh
3737
sudo ./llvm.sh ${{env.MAIN_LLVM_VERSION}} all
38+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{env.MAIN_LLVM_VERSION}} 200
3839
- name: Symlink Headers
3940
shell: bash
4041
run: sudo ln -s /usr/include/asm-generic /usr/include/asm

0 commit comments

Comments
 (0)