From b43919a061a7f56e2318025ba75edcc67e03bfb6 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Tue, 1 Aug 2023 15:13:58 -0400 Subject: [PATCH 1/3] ci: Use taiki-e/install-action This should binstall cargo-generate to save CI time. --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e32cc35e..fb4a5448 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,8 +44,9 @@ jobs: examples/xdp-hello examples/xdp-log - - name: Install bpf-linker - run: cargo install bpf-linker + - uses: taiki-e/install-action@v2 + with: + tool: bpf-linker - name: Set up Python uses: actions/setup-python@v4 From 55891f2ae1e9ca701bbeb20406ec1eca0a3d065c Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Tue, 1 Aug 2023 15:19:07 -0400 Subject: [PATCH 2/3] Fix CI - Use aya from git everywhere. - Remove names in macros. - Build probes in release. --- .github/workflows/ci.yml | 4 ++-- examples/aya-tool/myapp-common/Cargo.toml | 2 +- examples/aya-tool/myapp-ebpf/src/main.rs | 2 +- examples/aya-tool/myapp/Cargo.toml | 4 ++-- examples/aya-tool/xtask/src/build_ebpf.rs | 1 - .../cgroup-skb-egress-common/Cargo.toml | 2 +- .../cgroup-skb-egress-ebpf/src/main.rs | 6 +++--- .../cgroup-skb-egress/Cargo.toml | 4 ++-- .../cgroup-skb-egress/src/main.rs | 5 +++-- .../cgroup-skb-egress/xtask/src/build_ebpf.rs | 1 - .../kprobetcp/kprobetcp-common/Cargo.toml | 2 +- examples/kprobetcp/kprobetcp-ebpf/src/main.rs | 2 +- examples/kprobetcp/xtask/src/build_ebpf.rs | 1 - examples/lsm-nice/lsm-nice-ebpf/src/main.rs | 2 +- examples/lsm-nice/lsm-nice/src/main.rs | 20 +++++++++---------- examples/lsm-nice/xtask/src/build_ebpf.rs | 1 - .../tc-egress/tc-egress-common/Cargo.toml | 2 +- examples/tc-egress/tc-egress-ebpf/src/main.rs | 2 +- examples/tc-egress/tc-egress/Cargo.toml | 4 ++-- examples/tc-egress/tc-egress/src/main.rs | 2 +- examples/tc-egress/xtask/src/build_ebpf.rs | 1 - examples/xdp-drop/xdp-drop-common/Cargo.toml | 2 +- examples/xdp-drop/xdp-drop-ebpf/src/main.rs | 2 +- examples/xdp-drop/xtask/src/build_ebpf.rs | 1 - .../xdp-hello/xdp-hello-common/Cargo.toml | 2 +- examples/xdp-hello/xdp-hello-ebpf/src/main.rs | 2 +- examples/xdp-hello/xtask/src/build_ebpf.rs | 1 - examples/xdp-log/xdp-log-common/Cargo.toml | 2 +- examples/xdp-log/xdp-log-ebpf/src/main.rs | 5 +---- examples/xdp-log/xdp-log/src/main.rs | 7 +++++-- examples/xdp-log/xtask/src/build_ebpf.rs | 4 +--- 31 files changed, 45 insertions(+), 53 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb4a5448..9518cc4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: for dir in ./examples/*/ ; do pushd "${dir}" echo "Example: ${dir}." - cargo xtask build-ebpf - cargo build + cargo xtask build-ebpf --release + cargo build --release popd done diff --git a/examples/aya-tool/myapp-common/Cargo.toml b/examples/aya-tool/myapp-common/Cargo.toml index 73d03a42..59eb5d56 100644 --- a/examples/aya-tool/myapp-common/Cargo.toml +++ b/examples/aya-tool/myapp-common/Cargo.toml @@ -8,7 +8,7 @@ default = [] user = ["aya"] [dependencies] -aya = { version = "0.11", optional = true } +aya = { git = "https://github.com/aya-rs/aya", optional = true } [lib] path = "src/lib.rs" diff --git a/examples/aya-tool/myapp-ebpf/src/main.rs b/examples/aya-tool/myapp-ebpf/src/main.rs index f5ad19fc..3f8fab35 100644 --- a/examples/aya-tool/myapp-ebpf/src/main.rs +++ b/examples/aya-tool/myapp-ebpf/src/main.rs @@ -19,7 +19,7 @@ use vmlinux::task_struct; #[map] static PROCESSES: HashMap = HashMap::with_max_entries(32768, 0); -#[lsm(name = "task_alloc")] +#[lsm(hook = "task_alloc")] pub fn task_alloc(ctx: LsmContext) -> i32 { match unsafe { try_task_alloc(ctx) } { Ok(ret) => ret, diff --git a/examples/aya-tool/myapp/Cargo.toml b/examples/aya-tool/myapp/Cargo.toml index 10f36174..5df610fa 100644 --- a/examples/aya-tool/myapp/Cargo.toml +++ b/examples/aya-tool/myapp/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" publish = false [dependencies] -aya = "0.11" -aya-log = "0.1" +aya = { git = "https://github.com/aya-rs/aya" } +aya-log = { git = "https://github.com/aya-rs/aya" } myapp-common = { path = "../myapp-common", features = ["user"] } anyhow = "1" ctrlc = "3.2" diff --git a/examples/aya-tool/xtask/src/build_ebpf.rs b/examples/aya-tool/xtask/src/build_ebpf.rs index 645f038e..1c7d5f8a 100644 --- a/examples/aya-tool/xtask/src/build_ebpf.rs +++ b/examples/aya-tool/xtask/src/build_ebpf.rs @@ -44,7 +44,6 @@ pub fn build_ebpf(opts: Options) -> Result<(), anyhow::Error> { let target = format!("--target={}", opts.target); let mut args = vec![ "build", - "--verbose", target.as_str(), "-Z", "build-std=core", diff --git a/examples/cgroup-skb-egress/cgroup-skb-egress-common/Cargo.toml b/examples/cgroup-skb-egress/cgroup-skb-egress-common/Cargo.toml index 93ca8f42..3355713a 100644 --- a/examples/cgroup-skb-egress/cgroup-skb-egress-common/Cargo.toml +++ b/examples/cgroup-skb-egress/cgroup-skb-egress-common/Cargo.toml @@ -8,7 +8,7 @@ default = [] user = [ "aya" ] [dependencies] -aya = { version = ">=0.11", optional=true } +aya = { git = "https://github.com/aya-rs/aya", optional=true } [lib] path = "src/lib.rs" diff --git a/examples/cgroup-skb-egress/cgroup-skb-egress-ebpf/src/main.rs b/examples/cgroup-skb-egress/cgroup-skb-egress-ebpf/src/main.rs index d9b9aa67..f9d9bd73 100644 --- a/examples/cgroup-skb-egress/cgroup-skb-egress-ebpf/src/main.rs +++ b/examples/cgroup-skb-egress/cgroup-skb-egress-ebpf/src/main.rs @@ -17,14 +17,14 @@ use cgroup_skb_egress_common::PacketLog; mod bindings; use bindings::iphdr; -#[map(name = "EVENTS")] +#[map] static EVENTS: PerfEventArray = PerfEventArray::with_max_entries(1024, 0); -#[map(name = "BLOCKLIST")] // (1) +#[map] // (1) static BLOCKLIST: HashMap = HashMap::with_max_entries(1024, 0); -#[cgroup_skb(name = "cgroup_skb_egress")] +#[cgroup_skb] pub fn cgroup_skb_egress(ctx: SkBuffContext) -> i32 { match { try_cgroup_skb_egress(ctx) } { Ok(ret) => ret, diff --git a/examples/cgroup-skb-egress/cgroup-skb-egress/Cargo.toml b/examples/cgroup-skb-egress/cgroup-skb-egress/Cargo.toml index 86917443..ce99e13e 100644 --- a/examples/cgroup-skb-egress/cgroup-skb-egress/Cargo.toml +++ b/examples/cgroup-skb-egress/cgroup-skb-egress/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" publish = false [dependencies] -aya = { version = ">=0.11", features = ["async_tokio"] } -aya-log = "0.1" +aya = { git = "https://github.com/aya-rs/aya", features = ["async_tokio"] } +aya-log = { git = "https://github.com/aya-rs/aya" } cgroup-skb-egress-common = { path = "../cgroup-skb-egress-common", features = [ "user", ] } diff --git a/examples/cgroup-skb-egress/cgroup-skb-egress/src/main.rs b/examples/cgroup-skb-egress/cgroup-skb-egress/src/main.rs index 09326c51..a5850295 100644 --- a/examples/cgroup-skb-egress/cgroup-skb-egress/src/main.rs +++ b/examples/cgroup-skb-egress/cgroup-skb-egress/src/main.rs @@ -47,14 +47,15 @@ async fn main() -> Result<(), anyhow::Error> { program.attach(cgroup, CgroupSkbAttachType::Egress)?; let mut blocklist: HashMap<_, u32, u32> = - HashMap::try_from(bpf.map_mut("BLOCKLIST")?)?; + HashMap::try_from(bpf.map_mut("BLOCKLIST").unwrap())?; let block_addr: u32 = Ipv4Addr::new(1, 1, 1, 1).try_into()?; // (3) blocklist.insert(block_addr, 0, 0)?; - let mut perf_array = AsyncPerfEventArray::try_from(bpf.map_mut("EVENTS")?)?; + let mut perf_array = + AsyncPerfEventArray::try_from(bpf.take_map("EVENTS").unwrap())?; for cpu_id in online_cpus()? { let mut buf = perf_array.open(cpu_id, None)?; diff --git a/examples/cgroup-skb-egress/xtask/src/build_ebpf.rs b/examples/cgroup-skb-egress/xtask/src/build_ebpf.rs index e8256942..dfde3e1a 100644 --- a/examples/cgroup-skb-egress/xtask/src/build_ebpf.rs +++ b/examples/cgroup-skb-egress/xtask/src/build_ebpf.rs @@ -44,7 +44,6 @@ pub fn build_ebpf(opts: Options) -> Result<(), anyhow::Error> { let target = format!("--target={}", opts.target); let mut args = vec![ "build", - "--verbose", target.as_str(), "-Z", "build-std=core", diff --git a/examples/kprobetcp/kprobetcp-common/Cargo.toml b/examples/kprobetcp/kprobetcp-common/Cargo.toml index fbb8c662..29970e95 100644 --- a/examples/kprobetcp/kprobetcp-common/Cargo.toml +++ b/examples/kprobetcp/kprobetcp-common/Cargo.toml @@ -8,7 +8,7 @@ default = [] user = ["aya"] [dependencies] -aya = { version = ">=0.11", optional = true } +aya = { git = "https://github.com/aya-rs/aya", optional = true } [lib] path = "src/lib.rs" diff --git a/examples/kprobetcp/kprobetcp-ebpf/src/main.rs b/examples/kprobetcp/kprobetcp-ebpf/src/main.rs index 085ea8d4..65d4e150 100644 --- a/examples/kprobetcp/kprobetcp-ebpf/src/main.rs +++ b/examples/kprobetcp/kprobetcp-ebpf/src/main.rs @@ -17,7 +17,7 @@ use aya_log_ebpf::info; const AF_INET: u16 = 2; const AF_INET6: u16 = 10; -#[kprobe(name = "kprobetcp")] +#[kprobe] pub fn kprobetcp(ctx: ProbeContext) -> u32 { match try_kprobetcp(ctx) { Ok(ret) => ret, diff --git a/examples/kprobetcp/xtask/src/build_ebpf.rs b/examples/kprobetcp/xtask/src/build_ebpf.rs index 9b514a20..b21cd967 100644 --- a/examples/kprobetcp/xtask/src/build_ebpf.rs +++ b/examples/kprobetcp/xtask/src/build_ebpf.rs @@ -44,7 +44,6 @@ pub fn build_ebpf(opts: Options) -> Result<(), anyhow::Error> { let target = format!("--target={}", opts.target); let mut args = vec![ "build", - "--verbose", target.as_str(), "-Z", "build-std=core", diff --git a/examples/lsm-nice/lsm-nice-ebpf/src/main.rs b/examples/lsm-nice/lsm-nice-ebpf/src/main.rs index 2621ec9b..73ea6ae1 100644 --- a/examples/lsm-nice/lsm-nice-ebpf/src/main.rs +++ b/examples/lsm-nice/lsm-nice-ebpf/src/main.rs @@ -18,7 +18,7 @@ use vmlinux::task_struct; #[no_mangle] static PID: i32 = 0; -#[lsm(name = "task_setnice")] +#[lsm(hook = "task_setnice")] pub fn task_setnice(ctx: LsmContext) -> i32 { match unsafe { try_task_setnice(ctx) } { Ok(ret) => ret, diff --git a/examples/lsm-nice/lsm-nice/src/main.rs b/examples/lsm-nice/lsm-nice/src/main.rs index 24818a81..d81232ff 100644 --- a/examples/lsm-nice/lsm-nice/src/main.rs +++ b/examples/lsm-nice/lsm-nice/src/main.rs @@ -18,18 +18,18 @@ async fn main() -> Result<(), anyhow::Error> { // like to specify the eBPF program at runtime rather than at compile-time, you can // reach for `Bpf::load_file` instead. #[cfg(debug_assertions)] - let mut bpf = BpfLoader::new() - .set_global("PID", &pid, true) - .load(include_bytes_aligned!( - "../../target/bpfel-unknown-none/debug/lsm-nice" - ))?; + let mut bpf = BpfLoader::new().set_global("PID", &pid, true).load( + include_bytes_aligned!( + "../../target/bpfel-unknown-none/debug/lsm-nice" + ), + )?; #[cfg(not(debug_assertions))] - let mut bpf = BpfLoader::new() - .set_global("PID", &pid, true) - .load(include_bytes_aligned!( - "../../target/bpfel-unknown-none/release/lsm-nice" - ))?; + let mut bpf = BpfLoader::new().set_global("PID", &pid, true).load( + include_bytes_aligned!( + "../../target/bpfel-unknown-none/release/lsm-nice" + ), + )?; if let Err(e) = BpfLogger::init(&mut bpf) { // This can happen if you remove all log statements from your eBPF program. warn!("failed to initialize eBPF logger: {}", e); diff --git a/examples/lsm-nice/xtask/src/build_ebpf.rs b/examples/lsm-nice/xtask/src/build_ebpf.rs index 8564da70..53191521 100644 --- a/examples/lsm-nice/xtask/src/build_ebpf.rs +++ b/examples/lsm-nice/xtask/src/build_ebpf.rs @@ -44,7 +44,6 @@ pub fn build_ebpf(opts: Options) -> Result<(), anyhow::Error> { let target = format!("--target={}", opts.target); let mut args = vec![ "build", - "--verbose", target.as_str(), "-Z", "build-std=core", diff --git a/examples/tc-egress/tc-egress-common/Cargo.toml b/examples/tc-egress/tc-egress-common/Cargo.toml index ed59605e..be339979 100644 --- a/examples/tc-egress/tc-egress-common/Cargo.toml +++ b/examples/tc-egress/tc-egress-common/Cargo.toml @@ -8,7 +8,7 @@ default = [] user = ["aya"] [dependencies] -aya = { version = ">=0.11", optional = true } +aya = { git = "https://github.com/aya-rs/aya", optional = true } [lib] path = "src/lib.rs" diff --git a/examples/tc-egress/tc-egress-ebpf/src/main.rs b/examples/tc-egress/tc-egress-ebpf/src/main.rs index 0b363196..2ebed21e 100644 --- a/examples/tc-egress/tc-egress-ebpf/src/main.rs +++ b/examples/tc-egress/tc-egress-ebpf/src/main.rs @@ -16,7 +16,7 @@ use network_types::{ #[map] static BLOCKLIST: HashMap = HashMap::with_max_entries(1024, 0); -#[classifier(name = "tc_egress")] +#[classifier] pub fn tc_egress(ctx: TcContext) -> i32 { match try_tc_egress(ctx) { Ok(ret) => ret, diff --git a/examples/tc-egress/tc-egress/Cargo.toml b/examples/tc-egress/tc-egress/Cargo.toml index fe8e9d8e..5ca90378 100644 --- a/examples/tc-egress/tc-egress/Cargo.toml +++ b/examples/tc-egress/tc-egress/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" publish = false [dependencies] -aya = { version = ">=0.11", features = ["async_tokio"] } -aya-log = "0.1" +aya = { git = "https://github.com/aya-rs/aya", features = ["async_tokio"] } +aya-log = { git = "https://github.com/aya-rs/aya" } tc-egress-common = { path = "../tc-egress-common", features = ["user"] } anyhow = "1" clap = { version = "4.1", features = ["derive"] } diff --git a/examples/tc-egress/tc-egress/src/main.rs b/examples/tc-egress/tc-egress/src/main.rs index c5f85c9f..06ed8873 100644 --- a/examples/tc-egress/tc-egress/src/main.rs +++ b/examples/tc-egress/tc-egress/src/main.rs @@ -49,7 +49,7 @@ async fn main() -> Result<(), anyhow::Error> { // (1) let mut blocklist: HashMap<_, u32, u32> = - HashMap::try_from(bpf.map_mut("BLOCKLIST")?)?; + HashMap::try_from(bpf.map_mut("BLOCKLIST").unwrap())?; // (2) let block_addr: u32 = Ipv4Addr::new(1, 1, 1, 1).try_into()?; diff --git a/examples/tc-egress/xtask/src/build_ebpf.rs b/examples/tc-egress/xtask/src/build_ebpf.rs index 097acceb..51f18a34 100644 --- a/examples/tc-egress/xtask/src/build_ebpf.rs +++ b/examples/tc-egress/xtask/src/build_ebpf.rs @@ -44,7 +44,6 @@ pub fn build_ebpf(opts: Options) -> Result<(), anyhow::Error> { let target = format!("--target={}", opts.target); let mut args = vec![ "build", - "--verbose", target.as_str(), "-Z", "build-std=core", diff --git a/examples/xdp-drop/xdp-drop-common/Cargo.toml b/examples/xdp-drop/xdp-drop-common/Cargo.toml index 08624d90..ff2297e9 100644 --- a/examples/xdp-drop/xdp-drop-common/Cargo.toml +++ b/examples/xdp-drop/xdp-drop-common/Cargo.toml @@ -8,7 +8,7 @@ default = [] user = [ "aya" ] [dependencies] -aya = { version = ">=0.11", optional=true } +aya = { git = "https://github.com/aya-rs/aya", optional=true } [lib] path = "src/lib.rs" diff --git a/examples/xdp-drop/xdp-drop-ebpf/src/main.rs b/examples/xdp-drop/xdp-drop-ebpf/src/main.rs index dc2e2a78..053defab 100644 --- a/examples/xdp-drop/xdp-drop-ebpf/src/main.rs +++ b/examples/xdp-drop/xdp-drop-ebpf/src/main.rs @@ -21,7 +21,7 @@ fn panic(_info: &core::panic::PanicInfo) -> ! { unsafe { core::hint::unreachable_unchecked() } } -#[map(name = "BLOCKLIST")] // (1) +#[map] // (1) static BLOCKLIST: HashMap = HashMap::::with_max_entries(1024, 0); diff --git a/examples/xdp-drop/xtask/src/build_ebpf.rs b/examples/xdp-drop/xtask/src/build_ebpf.rs index 44552320..15c7f59a 100644 --- a/examples/xdp-drop/xtask/src/build_ebpf.rs +++ b/examples/xdp-drop/xtask/src/build_ebpf.rs @@ -44,7 +44,6 @@ pub fn build_ebpf(opts: Options) -> Result<(), anyhow::Error> { let target = format!("--target={}", opts.target); let mut args = vec![ "build", - "--verbose", target.as_str(), "-Z", "build-std=core", diff --git a/examples/xdp-hello/xdp-hello-common/Cargo.toml b/examples/xdp-hello/xdp-hello-common/Cargo.toml index 4b76e582..51b7b04c 100644 --- a/examples/xdp-hello/xdp-hello-common/Cargo.toml +++ b/examples/xdp-hello/xdp-hello-common/Cargo.toml @@ -8,7 +8,7 @@ default = [] user = [ "aya" ] [dependencies] -aya = { version = ">=0.11", optional=true } +aya = { git = "https://github.com/aya-rs/aya", optional=true } [lib] path = "src/lib.rs" diff --git a/examples/xdp-hello/xdp-hello-ebpf/src/main.rs b/examples/xdp-hello/xdp-hello-ebpf/src/main.rs index 34d1f653..7d501005 100644 --- a/examples/xdp-hello/xdp-hello-ebpf/src/main.rs +++ b/examples/xdp-hello/xdp-hello-ebpf/src/main.rs @@ -4,7 +4,7 @@ use aya_bpf::{bindings::xdp_action, macros::xdp, programs::XdpContext}; use aya_log_ebpf::info; -#[xdp(name = "xdp_hello")] // (4) +#[xdp] // (4) pub fn xdp_hello(ctx: XdpContext) -> u32 { // (5) match unsafe { try_xdp_hello(ctx) } { diff --git a/examples/xdp-hello/xtask/src/build_ebpf.rs b/examples/xdp-hello/xtask/src/build_ebpf.rs index 7a90b019..7386f94d 100644 --- a/examples/xdp-hello/xtask/src/build_ebpf.rs +++ b/examples/xdp-hello/xtask/src/build_ebpf.rs @@ -44,7 +44,6 @@ pub fn build_ebpf(opts: Options) -> Result<(), anyhow::Error> { let target = format!("--target={}", opts.target); let mut args = vec![ "build", - "--verbose", target.as_str(), "-Z", "build-std=core", diff --git a/examples/xdp-log/xdp-log-common/Cargo.toml b/examples/xdp-log/xdp-log-common/Cargo.toml index 3a4368a6..eab5abb3 100644 --- a/examples/xdp-log/xdp-log-common/Cargo.toml +++ b/examples/xdp-log/xdp-log-common/Cargo.toml @@ -8,7 +8,7 @@ default = [] user = [ "aya" ] [dependencies] -aya = { version = ">=0.11", optional=true } +aya = { git = "https://github.com/aya-rs/aya", optional=true } [lib] path = "src/lib.rs" diff --git a/examples/xdp-log/xdp-log-ebpf/src/main.rs b/examples/xdp-log/xdp-log-ebpf/src/main.rs index a4ec0ae3..6c7838e4 100644 --- a/examples/xdp-log/xdp-log-ebpf/src/main.rs +++ b/examples/xdp-log/xdp-log-ebpf/src/main.rs @@ -63,10 +63,7 @@ fn try_xdp_firewall(ctx: XdpContext) -> Result { }; // (3) - info!( - &ctx, - "SRC IP: {:i}, SRC PORT: {}", source_addr, source_port - ); + info!(&ctx, "SRC IP: {:i}, SRC PORT: {}", source_addr, source_port); Ok(xdp_action::XDP_PASS) } diff --git a/examples/xdp-log/xdp-log/src/main.rs b/examples/xdp-log/xdp-log/src/main.rs index 39050565..d0463b87 100644 --- a/examples/xdp-log/xdp-log/src/main.rs +++ b/examples/xdp-log/xdp-log/src/main.rs @@ -1,6 +1,9 @@ -use aya::{include_bytes_aligned, Bpf}; use anyhow::Context; -use aya::programs::{Xdp, XdpFlags}; +use aya::{ + include_bytes_aligned, + programs::{Xdp, XdpFlags}, + Bpf, +}; use aya_log::BpfLogger; use clap::Parser; use log::{info, warn}; diff --git a/examples/xdp-log/xtask/src/build_ebpf.rs b/examples/xdp-log/xtask/src/build_ebpf.rs index c476aded..5e5867a0 100644 --- a/examples/xdp-log/xtask/src/build_ebpf.rs +++ b/examples/xdp-log/xtask/src/build_ebpf.rs @@ -1,5 +1,4 @@ -use std::path::PathBuf; -use std::process::Command; +use std::{path::PathBuf, process::Command}; use clap::Parser; @@ -45,7 +44,6 @@ pub fn build_ebpf(opts: Options) -> Result<(), anyhow::Error> { let target = format!("--target={}", opts.target); let mut args = vec![ "build", - "--verbose", target.as_str(), "-Z", "build-std=core", From bc0da20fba21ac87b4db07e827fb7246f2627267 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Tue, 1 Aug 2023 16:25:48 -0400 Subject: [PATCH 3/3] Run CI on a schedule Keep the cache warm. --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9518cc4e..af821414 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,9 @@ on: - main - staging + schedule: + - cron: 00 4 * * * + env: CARGO_TERM_COLOR: always