Fix CI (#2292)
* p * a * p * a * delete transfered * b * bring back transferred * ?? * xx * conditional * ? * debug * a * 🤬🤬🤬🤬🤬🤬🤬 * a * a * comment
This commit is contained in:
parent
8ef4e2aff0
commit
30ae963c45
@ -30,7 +30,7 @@ runs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: sudo apt purge -y llvm* clang*
|
run: sudo apt purge -y llvm* clang*
|
||||||
- name: Install LLVM and Clang
|
- name: Install LLVM and Clang
|
||||||
uses: KyleMayes/install-llvm-action@v1
|
uses: KyleMayes/install-llvm-action@v2
|
||||||
with:
|
with:
|
||||||
directory: ${{ runner.temp }}/llvm
|
directory: ${{ runner.temp }}/llvm
|
||||||
version: 17
|
version: 17
|
||||||
|
@ -27,7 +27,7 @@ runs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: sudo apt purge -y llvm* clang*
|
run: sudo apt purge -y llvm* clang*
|
||||||
- name: Install LLVM and Clang
|
- name: Install LLVM and Clang
|
||||||
uses: KyleMayes/install-llvm-action@v1
|
uses: KyleMayes/install-llvm-action@v2
|
||||||
with:
|
with:
|
||||||
directory: ${{ runner.temp }}/llvm
|
directory: ${{ runner.temp }}/llvm
|
||||||
version: 17
|
version: 17
|
||||||
|
2
.github/workflows/ubuntu-prepare/action.yml
vendored
2
.github/workflows/ubuntu-prepare/action.yml
vendored
@ -21,7 +21,7 @@ runs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: rustup toolchain install nightly --allow-downgrade
|
run: rustup toolchain install nightly --allow-downgrade
|
||||||
- name: Install LLVM and Clang
|
- name: Install LLVM and Clang
|
||||||
uses: KyleMayes/install-llvm-action@v1
|
uses: KyleMayes/install-llvm-action@v2
|
||||||
with:
|
with:
|
||||||
directory: ${{ runner.temp }}/llvm
|
directory: ${{ runner.temp }}/llvm
|
||||||
version: 17
|
version: 17
|
@ -9,9 +9,6 @@ runs:
|
|||||||
toolchain: stable
|
toolchain: stable
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- name: Windows Build
|
|
||||||
shell: pwsh
|
|
||||||
run: cargo build --verbose
|
|
||||||
- name: Build docs
|
- name: Build docs
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
run: cargo doc
|
run: cargo doc
|
||||||
|
@ -131,7 +131,7 @@ llmp_debug = ["std", "libafl_bolts/llmp_debug"]
|
|||||||
llmp_small_maps = ["libafl_bolts/llmp_small_maps"] # reduces initial map size for llmp
|
llmp_small_maps = ["libafl_bolts/llmp_small_maps"] # reduces initial map size for llmp
|
||||||
|
|
||||||
## Grammar mutator. Requires nightly.
|
## Grammar mutator. Requires nightly.
|
||||||
nautilus = ["std", "serde_json/std", "pyo3", "rand_trait", "regex-syntax"]
|
nautilus = ["std", "serde_json/std", "pyo3", "rand_trait", "regex-syntax", "regex"]
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
rustversion = "1.0"
|
rustversion = "1.0"
|
||||||
|
@ -4,7 +4,6 @@ use std::sync::OnceLock;
|
|||||||
|
|
||||||
use libafl_bolts::rands::Rand;
|
use libafl_bolts::rands::Rand;
|
||||||
use pyo3::prelude::{PyObject, Python};
|
use pyo3::prelude::{PyObject, Python};
|
||||||
use regex;
|
|
||||||
use regex_syntax::hir::Hir;
|
use regex_syntax::hir::Hir;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ impl TransferringMetadata {
|
|||||||
|
|
||||||
/// Simple feedback which may be used to test whether the testcase was transferred from another node
|
/// Simple feedback which may be used to test whether the testcase was transferred from another node
|
||||||
/// in a multi-node fuzzing arrangement.
|
/// in a multi-node fuzzing arrangement.
|
||||||
#[derive(Copy, Clone, Debug)]
|
#[derive(Copy, Clone, Debug, Default)]
|
||||||
pub struct TransferredFeedback {
|
pub struct TransferredFeedback {
|
||||||
#[cfg(feature = "track_hit_feedbacks")]
|
#[cfg(feature = "track_hit_feedbacks")]
|
||||||
// The previous run's result of `Self::is_interesting`
|
// The previous run's result of `Self::is_interesting`
|
||||||
|
@ -18,8 +18,7 @@ use crate::{
|
|||||||
generators::nautilus::NautilusContext,
|
generators::nautilus::NautilusContext,
|
||||||
inputs::nautilus::NautilusInput,
|
inputs::nautilus::NautilusInput,
|
||||||
mutators::{MutationResult, Mutator},
|
mutators::{MutationResult, Mutator},
|
||||||
prelude::HasRand,
|
state::{HasCorpus, HasRand},
|
||||||
state::HasCorpus,
|
|
||||||
Error, HasMetadata,
|
Error, HasMetadata,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -386,7 +386,7 @@ impl Deref for NopShMem {
|
|||||||
/// that can use internal mutability.
|
/// that can use internal mutability.
|
||||||
/// Useful if the `ShMemProvider` needs to keep local state.
|
/// Useful if the `ShMemProvider` needs to keep local state.
|
||||||
#[cfg(feature = "alloc")]
|
#[cfg(feature = "alloc")]
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone, Default)]
|
||||||
pub struct RcShMem<T: ShMemProvider> {
|
pub struct RcShMem<T: ShMemProvider> {
|
||||||
internal: ManuallyDrop<T::ShMem>,
|
internal: ManuallyDrop<T::ShMem>,
|
||||||
provider: Rc<RefCell<T>>,
|
provider: Rc<RefCell<T>>,
|
||||||
|
@ -1125,7 +1125,7 @@ impl EmulatorMemoryChunk {
|
|||||||
let new_addr = self.addr + range.start;
|
let new_addr = self.addr + range.start;
|
||||||
let slice_size = range.clone().count();
|
let slice_size = range.clone().count();
|
||||||
|
|
||||||
if new_addr + (slice_size as GuestUsize) >= self.addr + self.size {
|
if new_addr + (slice_size as GuestUsize) >= self.addr + self.size.into() {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,8 +14,6 @@ instance_idx = int(sys.argv[1])
|
|||||||
|
|
||||||
# Set llvm config
|
# Set llvm config
|
||||||
os.environ["LLVM_CONFIG"] = "llvm-config"
|
os.environ["LLVM_CONFIG"] = "llvm-config"
|
||||||
# DOCS_RS is needed for libafl_frida to build without auto-download
|
|
||||||
os.environ["DOCS_RS"] = "1"
|
|
||||||
|
|
||||||
command = (
|
command = (
|
||||||
"DOCS_RS=1 cargo hack check --workspace --each-feature --clean-per-run "
|
"DOCS_RS=1 cargo hack check --workspace --each-feature --clean-per-run "
|
||||||
@ -34,4 +32,9 @@ for task in output[
|
|||||||
instance_idx * 2 * task_per_core : (instance_idx + 1) * 2 * task_per_core
|
instance_idx * 2 * task_per_core : (instance_idx + 1) * 2 * task_per_core
|
||||||
]:
|
]:
|
||||||
print("Running ", task)
|
print("Running ", task)
|
||||||
cargo_check = subprocess.check_output(task, shell=True, text=True)
|
print(os.environ)
|
||||||
|
if "libafl_frida" in task:
|
||||||
|
# DOCS_RS is needed for libafl_frida to build without auto-download feature
|
||||||
|
cargo_check = subprocess.check_output(task, shell=True, text=True, env=dict(os.environ, DOCS_RS="1"))
|
||||||
|
else:
|
||||||
|
cargo_check = subprocess.check_output(task, shell=True, text=True)
|
Loading…
x
Reference in New Issue
Block a user