Merge pull request #2750 from rivy/fix.cicd

Fix/enhance CICD

.vscode/cSpell.json

@@ -11,7 +11,7 @@
     { "name": "workspace", "path": "./cspell.dictionaries/workspace.wordlist.txt" }
   ],
   // ignorePaths -  a list of globs to specify which files are to be ignored
-  "ignorePaths": ["Cargo.lock", "target/**", "tests/**/fixtures/**", "src/uu/dd/test-resources/**"],
+  "ignorePaths": ["Cargo.lock", "target/**", "tests/**/fixtures/**", "src/uu/dd/test-resources/**", "vendor/**"],
   // ignoreWords - a list of words to be ignored (even if they are in the flagWords)
   "ignoreWords": [],
   // words - list of words to be always considered correct

Cargo.lock

@@ -1,7 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "Inflector"
 version = "0.11.4"
@@ -213,9 +211,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cc"
-version = "1.0.71"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd"
+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
 
 [[package]]
 name = "cexpr"
@@ -320,7 +318,7 @@ dependencies = [
  "glob",
  "lazy_static",
  "libc",
- "nix 0.20.0",
+ "nix 0.23.1",
  "pretty_assertions",
  "rand 0.7.3",
  "regex",
@@ -625,7 +623,7 @@ version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf"
 dependencies = [
- "nix 0.23.0",
+ "nix 0.23.1",
  "winapi 0.3.9",
 ]
 
@@ -1007,9 +1005,9 @@ checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219"
 
 [[package]]
 name = "libloading"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cf036d15402bea3c5d4de17b3fce76b3e4a56ebc1f577be0e7a72f7c607cf0"
+checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52"
 dependencies = [
  "cfg-if 1.0.0",
  "winapi 0.3.9",
@@ -1109,30 +1107,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "nix"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 1.0.0",
- "libc",
-]
-
-[[package]]
-name = "nix"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 1.0.0",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.21.0"
@@ -1148,9 +1122,7 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f305c2c2e4c39a82f7bf0bf65fb557f9070ce06781d4f2454295cc34b1c43188"
+version = "0.23.1"
 dependencies = [
  "bitflags",
  "cc",
@@ -2216,7 +2188,7 @@ version = "0.0.8"
 dependencies = [
  "atty",
  "clap",
- "nix 0.20.0",
+ "nix 0.23.1",
  "thiserror",
  "unix_socket",
  "uucore",
@@ -2691,7 +2663,7 @@ dependencies = [
  "atty",
  "clap",
  "crossterm",
- "nix 0.19.1",
+ "nix 0.23.1",
  "redox_syscall",
  "redox_termios",
  "unicode-segmentation",
@@ -2716,7 +2688,7 @@ version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
- "nix 0.20.0",
+ "nix 0.23.1",
  "uucore",
  "uucore_procs",
 ]
@@ -3065,7 +3037,7 @@ version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
- "nix 0.20.0",
+ "nix 0.23.1",
  "redox_syscall",
  "uucore",
  "uucore_procs",
@@ -3100,7 +3072,7 @@ version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
- "nix 0.20.0",
+ "nix 0.23.1",
  "uucore",
  "uucore_procs",
 ]
@@ -3231,7 +3203,7 @@ dependencies = [
  "bytecount",
  "clap",
  "libc",
- "nix 0.20.0",
+ "nix 0.23.1",
  "unicode-width",
  "utf-8",
  "uucore",
@@ -3263,7 +3235,7 @@ name = "uu_yes"
 version = "0.0.8"
 dependencies = [
  "clap",
- "nix 0.20.0",
+ "nix 0.23.1",
  "uucore",
  "uucore_procs",
 ]
@@ -3280,7 +3252,7 @@ dependencies = [
  "getopts",
  "lazy_static",
  "libc",
- "nix 0.20.0",
+ "nix 0.23.1",
  "once_cell",
  "os_display",
  "termion",

Cargo.toml

@@ -381,12 +381,15 @@ atty = "0.2"
 rlimit = "0.4.0"
 
 [target.'cfg(unix)'.dev-dependencies]
-nix = "0.20.0"
-
+nix = "=0.23.1"
 rust-users = { version="0.10", package="users" }
 unix_socket = "0.5.0"
 
-
 [[bin]]
 name = "coreutils"
 path = "src/bin/coreutils.rs"
+
+[patch.crates-io]
+# FixME: [2021-11-16; rivy] remove 'nix' patch when MacOS compatibility is restored; ref: <https://github.com/nix-rust/nix/pull/1590>
+# nix = { git = "https://github.com/rivy-t/nix" }
+nix = { path = "vendor/nix-v0.23.1-patched" }

src/uu/arch/Cargo.toml

@@ -23,3 +23,6 @@ uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_p
 [[bin]]
 name = "arch"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+normal = ["uucore_procs"]

src/uu/base32/Cargo.toml

@@ -24,5 +24,4 @@ name = "base32"
 path = "src/main.rs"
 
 [package.metadata.cargo-udeps.ignore]
-# Necessary for "make all"
 normal = ["uucore_procs"]

src/uu/base64/Cargo.toml

@@ -25,5 +25,4 @@ name = "base64"
 path = "src/main.rs"
 
 [package.metadata.cargo-udeps.ignore]
-# Necessary for "make all"
 normal = ["uucore_procs"]

src/uu/basename/Cargo.toml

@@ -24,5 +24,4 @@ name = "basename"
 path = "src/main.rs"
 
 [package.metadata.cargo-udeps.ignore]
-# Necessary for "make all"
 normal = ["uucore_procs"]

src/uu/basenc/Cargo.toml

@@ -25,5 +25,4 @@ name = "basenc"
 path = "src/main.rs"
 
 [package.metadata.cargo-udeps.ignore]
-# Necessary for "make all"
 normal = ["uucore_procs"]

src/uu/cat/Cargo.toml

@@ -23,7 +23,7 @@ uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_p
 
 [target.'cfg(unix)'.dependencies]
 unix_socket = "0.5.0"
-nix = "0.20.0"
+nix = "=0.23.1"
 
 [target.'cfg(windows)'.dependencies]
 winapi-util = "0.1.5"
@@ -31,3 +31,6 @@ winapi-util = "0.1.5"
 [[bin]]
 name = "cat"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+normal = ["uucore_procs"]

src/uu/chcon/Cargo.toml

@@ -25,3 +25,6 @@ libc         = { version = "0.2"   }
 [[bin]]
 name = "chcon"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+normal = ["uucore_procs"]

src/uu/chcon/src/chcon.rs

@@ -707,7 +707,7 @@ fn root_dev_ino_warn(dir_name: &Path) {
 // When a program like chgrp performs a recursive traversal that requires traversing symbolic links,
 // it is *not* a problem.
 // However, when invoked with "-P -R", it deserves a warning.
-// The fts_options parameter records the options that control this aspect of fts's behavior,
+// The fts_options parameter records the options that control this aspect of fts behavior,
 // so test that.
 fn cycle_warning_required(fts_options: c_int, entry: &fts::EntryRef) -> bool {
     // When dereferencing no symlinks, or when dereferencing only those listed on the command line

src/uu/chgrp/Cargo.toml

@@ -22,3 +22,6 @@ uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_p
 [[bin]]
 name = "chgrp"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+normal = ["uucore_procs"]

src/uu/chmod/Cargo.toml

@@ -24,3 +24,6 @@ walkdir = "2.2"
 [[bin]]
 name = "chmod"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+normal = ["uucore_procs"]

src/uu/chown/Cargo.toml

@@ -22,3 +22,6 @@ uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_p
 [[bin]]
 name = "chown"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+normal = ["uucore_procs"]

src/uu/chroot/Cargo.toml

@@ -22,3 +22,6 @@ uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_p
 [[bin]]
 name = "chroot"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+normal = ["uucore_procs"]

src/uu/cksum/Cargo.toml

@@ -25,5 +25,4 @@ name = "cksum"
 path = "src/main.rs"
 
 [package.metadata.cargo-udeps.ignore]
-# Necessary for "make all"
 normal = ["uucore_procs"]

src/uu/comm/Cargo.toml

@@ -25,5 +25,4 @@ name = "comm"
 path = "src/main.rs"
 
 [package.metadata.cargo-udeps.ignore]
-# Necessary for "make all"
 normal = ["uucore_procs"]

src/uu/cp/Cargo.toml

@@ -47,5 +47,4 @@ feat_selinux = ["selinux"]
 feat_acl = ["exacl"]
 
 [package.metadata.cargo-udeps.ignore]
-# Necessary for "make all"
 normal = ["uucore_procs"]