Skip to content

Commit 542b7f7

Browse files
authored
Fix CI (#3248)
* fix ci track: dtolnay/proc-macro2#501 * format toml * fix typo * Use nightly for libafl_frida * Install nightly for splitter * Use dtolnay/rust-toolchain@nightly * install ca-certificates
1 parent 0e9dfd6 commit 542b7f7

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

.github/workflows/build_and_test.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,16 @@ jobs:
166166
with: { shared-key: "ubuntu" }
167167
# ---- build and feature check ----
168168
# cargo-hack's --feature-powerset would be nice here but libafl has a too many knobs
169+
170+
# Tracking: https://github.com/CensoredUsername/dynasm-rs/issues/114
171+
# One dep of libafl_frida fails on `DOCS_RS` for stable toolchain. Therefore, we _only_ run nightly for that.
172+
# For the rest of other crates, we still use stable toolchain.
173+
- name: "Setup nightly"
174+
uses: dtolnay/rust-toolchain@nightly
175+
with:
176+
components: clippy, rustfmt
177+
- name: "But default to stable"
178+
run: rustup default stable
169179
- name: Check each feature
170180
# Skipping `python` as it has to be built with the `maturin` tool
171181
# `sancov_pcguard_edges` is tested seperatelyc

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ RUN apt-get update && \
6464
python3-pip \
6565
python3-venv \
6666
software-properties-common \
67+
ca-certificates \
6768
wget
6869
RUN set -ex &&\
6970
wget https://apt.llvm.org/llvm.sh &&\

utils/ci_splitter/src/main.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,13 @@ fn main() -> Result<(), Box<dyn Error>> {
6767

6868
// run each task, with DOCS_RS override for libafl_frida
6969
let mut cmd = Command::new("bash");
70-
cmd.arg("-c").arg(task);
70+
cmd.arg("-c");
7171
if task.contains("libafl_frida") {
7272
cmd.env("DOCS_RS", "1");
73+
let task = task.replace("cargo ", "cargo +nightly ");
74+
cmd.arg(task);
75+
} else {
76+
cmd.arg(task);
7377
}
7478
let status = cmd.status()?;
7579
if !status.success() {

0 commit comments

Comments
 (0)