ci: fix CI by correcting wrong cfg value & removing cache with sudo (#…

…2394) * refactor: correct wrong cfg value && remove ones that do not exist * debug ci * debug ci * debug ci * debug ci * test: disable test_mq module for Fuchsia * style: fmt
nix-rust · May 5, 2024 · 047d662 · 047d662
1 parent 590ab4d
commit 047d662
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
           TARGET: '${{ env.TARGET }}'
 
       - name: before_cache_script
-        run: rm -rf $CARGO_HOME/registry/index
+        run: sudo rm -rf $CARGO_HOME/registry/index
 
   macos-aarch64:
     runs-on: macos-14
@@ -68,7 +68,7 @@ jobs:
           TARGET: "${{ env.TARGET }}"
 
       - name: before_cache_script
-        run: rm -rf $CARGO_HOME/registry/index
+        run: sudo rm -rf $CARGO_HOME/registry/index
 
   # Use cross for QEMU-based testing
   # cross needs to execute Docker, GitHub Action already has it installed
@@ -162,7 +162,7 @@ jobs:
           TARGET: '${{ matrix.TARGET }}'
 
       - name: before_cache_script
-        run: rm -rf $CARGO_HOME/registry/index
+        run: sudo rm -rf $CARGO_HOME/registry/index;
 
   rust_stable:
     runs-on: ubuntu-20.04
@@ -188,7 +188,7 @@ jobs:
           TARGET: '${{ env.TARGET }}'
 
       - name: before_cache_script
-        run: rm -rf $CARGO_HOME/registry/index
+        run: sudo rm -rf $CARGO_HOME/registry/index
 
 
 

diff --git a/build.rs b/build.rs
@@ -26,4 +26,15 @@ fn main() {
         netbsdlike: { any(netbsd, openbsd) },
         solarish: { any(illumos, solaris) },
     }
+
+    // Below are Nix's custom cfg values that we need to let the compiler know
+    println!("cargo:rustc-check-cfg=cfg(apple_targets)");
+    println!("cargo:rustc-check-cfg=cfg(bsd)");
+    println!("cargo:rustc-check-cfg=cfg(bsd_without_apple)");
+    println!("cargo:rustc-check-cfg=cfg(linux_android)");
+    println!("cargo:rustc-check-cfg=cfg(freebsdlike)");
+    println!("cargo:rustc-check-cfg=cfg(netbsdlike)");
+    println!("cargo:rustc-check-cfg=cfg(solarish)");
+    println!("cargo:rustc-check-cfg=cfg(fbsd14)");
+    println!("cargo:rustc-check-cfg=cfg(qemu)");
 }
diff --git a/src/sys/signal.rs b/src/sys/signal.rs
@@ -597,7 +597,7 @@ impl SigSet {
         target_os = "haiku",
         target_os = "hurd",
         target_os = "aix",
-        target_os = "fushsia"
+        target_os = "fuchsia"
     ))]
     #[doc(alias("sigsuspend"))]
     pub fn suspend(&self) -> Result<()> {

diff --git a/test/common/mod.rs b/test/common/mod.rs
@@ -37,8 +37,8 @@ cfg_if! {
 #[macro_export]
 macro_rules! require_mount {
     ($name:expr) => {
-        use ::sysctl::{CtlValue, Sysctl};
         use nix::unistd::Uid;
+        use sysctl::{CtlValue, Sysctl};
 
         let ctl = ::sysctl::Ctl::new("vfs.usermount").unwrap();
         if !Uid::current().is_root() && CtlValue::Int(0) == ctl.value().unwrap()
@@ -65,7 +65,7 @@ macro_rules! skip_if_cirrus {
 #[macro_export]
 macro_rules! skip_if_jailed {
     ($name:expr) => {
-        use ::sysctl::{CtlValue, Sysctl};
+        use sysctl::{CtlValue, Sysctl};
 
         let ctl = ::sysctl::Ctl::new("security.jail.jailed").unwrap();
         if let CtlValue::Int(1) = ctl.value().unwrap() {

diff --git a/test/sys/test_signal.rs b/test/sys/test_signal.rs
@@ -350,7 +350,7 @@ fn test_sigwait() {
     target_os = "haiku",
     target_os = "hurd",
     target_os = "aix",
-    target_os = "fushsia"
+    target_os = "fuchsia"
 ))]
 #[test]
 fn test_sigsuspend() {

diff --git a/test/test.rs b/test/test.rs
@@ -13,12 +13,7 @@ mod test_errno;
 mod test_fcntl;
 #[cfg(linux_android)]
 mod test_kmod;
-#[cfg(any(
-    freebsdlike,
-    target_os = "fushsia",
-    target_os = "linux",
-    target_os = "netbsd"
-))]
+#[cfg(any(freebsdlike, target_os = "linux", target_os = "netbsd"))]
 mod test_mq;
 #[cfg(not(target_os = "redox"))]
 mod test_net;

diff --git a/test/test_fcntl.rs b/test/test_fcntl.rs
@@ -13,7 +13,6 @@ use nix::fcntl::{openat2, OpenHow, ResolveFlag};
     target_env = "gnu",
     any(
         target_arch = "x86_64",
-        target_arch = "x32",
         target_arch = "powerpc",
         target_arch = "s390x"
     )
@@ -146,7 +145,6 @@ fn test_renameat() {
     target_env = "gnu",
     any(
         target_arch = "x86_64",
-        target_arch = "x32",
         target_arch = "powerpc",
         target_arch = "s390x"
     )
@@ -190,7 +188,6 @@ fn test_renameat2_behaves_like_renameat_with_no_flags() {
     target_env = "gnu",
     any(
         target_arch = "x86_64",
-        target_arch = "x32",
         target_arch = "powerpc",
         target_arch = "s390x"
     )
@@ -238,7 +235,6 @@ fn test_renameat2_exchange() {
     target_env = "gnu",
     any(
         target_arch = "x86_64",
-        target_arch = "x32",
         target_arch = "powerpc",
         target_arch = "s390x"
     )