Merge branch 'main' into fix/id-human-readable-output

Adds l10n translations for `id-output-rgid`

Author: frendsick

.cargo/config.toml

@@ -3,3 +3,8 @@ linker = "x86_64-unknown-redox-gcc"
 
 [env]
 PROJECT_NAME_FOR_VERSION_STRING = "uutils coreutils"
+
+# libstdbuf must be a shared library, so musl libc can't be linked statically
+# https://github.com/rust-lang/rust/issues/82193
+[build]
+rustflags = [ "-C", "target-feature=-crt-static" ]

.github/workflows/CICD.yml

@@ -443,14 +443,14 @@ jobs:
               --arg multisize "$SIZE_MULTI" \
               '{($date): { sha: $sha, size: $size, multisize: $multisize, }}' > size-result.json
     - name: Download the previous individual size result
-      uses: dawidd6/action-download-artifact@v9
+      uses: dawidd6/action-download-artifact@v10
       with:
         workflow: CICD.yml
         name: individual-size-result
         repo: uutils/coreutils
         path: dl
     - name: Download the previous size result
-      uses: dawidd6/action-download-artifact@v9
+      uses: dawidd6/action-download-artifact@v10
       with:
         workflow: CICD.yml
         name: size-result
@@ -526,6 +526,8 @@ jobs:
           - { os: ubuntu-latest  , target: x86_64-unknown-redox        , features: feat_os_unix_redox     , use-cross: redoxer , skip-tests: true }
           - { os: ubuntu-latest  , target: wasm32-unknown-unknown      , default-features: false, features: uucore/format, skip-tests: true, skip-package: true, skip-publish: true }
           - { os: macos-latest   , target: aarch64-apple-darwin        , features: feat_os_macos, workspace-tests: true } # M1 CPU
+          # PR #7964: Mac should still build even if the feature is not enabled
+          - { os: macos-latest   , target: aarch64-apple-darwin        , workspace-tests: true } # M1 CPU
           - { os: macos-13       , target: x86_64-apple-darwin         , features: feat_os_macos, workspace-tests: true }
           - { os: windows-latest , target: i686-pc-windows-msvc        , features: feat_os_windows }
           - { os: windows-latest , target: x86_64-pc-windows-gnu       , features: feat_os_windows }
@@ -653,10 +655,6 @@ jobs:
             ;;
         esac
         outputs CARGO_TEST_OPTIONS
-        # ** pass needed environment into `cross` container (iff `cross` not already configured via "Cross.toml")
-        if [ "${CARGO_CMD}" = 'cross' ] && [ ! -e "Cross.toml" ] ; then
-          printf "[build.env]\npassthrough = [\"CI\", \"RUST_BACKTRACE\", \"CARGO_TERM_COLOR\"]\n" > Cross.toml
-        fi
         # * executable for `strip`?
         STRIP="strip"
         case ${{ matrix.job.target }} in

.github/workflows/GnuTests.yml

@@ -136,7 +136,7 @@ jobs:
       working-directory: ${{ steps.vars.outputs.path_GNU }}
 
     - name: Retrieve reference artifacts
-      uses: dawidd6/action-download-artifact@v9
+      uses: dawidd6/action-download-artifact@v10
       # ref: <https://github.com/dawidd6/action-download-artifact>
       continue-on-error: true ## don't break the build for missing reference artifacts (may be expired or just not generated yet)
       with:
@@ -162,6 +162,7 @@ jobs:
         sudo locale-gen
         sudo locale-gen --keep-existing fr_FR
         sudo locale-gen --keep-existing fr_FR.UTF-8
+        sudo locale-gen --keep-existing es_ES.UTF-8
         sudo locale-gen --keep-existing sv_SE
         sudo locale-gen --keep-existing sv_SE.UTF-8
         sudo locale-gen --keep-existing en_US
@@ -193,7 +194,7 @@ jobs:
 
     - name: Selinux - Build for selinux tests
       run: |
-        lima bash -c "cd ~/work/uutils/ && bash util/build-gnu.sh"
+        lima bash -c "cd ~/work/uutils/ && bash util/build-gnu.sh --release-build"
         lima bash -c "mkdir -p ~/work/gnu/tests-selinux/"
 
     - name: Selinux - Run selinux tests

.github/workflows/code-quality.yml

@@ -78,7 +78,7 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          - { os: ubuntu-latest  , features: feat_os_unix }
+          - { os: ubuntu-latest  , features: all             , workspace: true }
           - { os: macos-latest   , features: feat_os_macos }
           - { os: windows-latest , features: feat_os_windows }
     steps:
@@ -104,6 +104,16 @@ jobs:
           *) FAIL_ON_FAULT=true ; FAULT_TYPE=error ;;
         esac;
         outputs FAIL_ON_FAULT FAULT_TYPE
+    - name: Install/setup prerequisites
+      shell: bash
+      run: |
+        ## Install/setup prerequisites
+        case '${{ matrix.job.os }}' in
+          ubuntu-*)
+            # selinux headers needed to enable all features
+            sudo apt-get -y install libselinux1-dev
+          ;;
+        esac
     - name: "`cargo clippy` lint testing"
       uses: nick-fields/retry@v3
       with:
@@ -117,7 +127,17 @@ jobs:
           fault_type="${{ steps.vars.outputs.FAULT_TYPE }}"
           fault_prefix=$(echo "$fault_type" | tr '[:lower:]' '[:upper:]')
           # * convert any warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>
-          S=$(cargo clippy --all-targets --features ${{ matrix.job.features }} --tests -pcoreutils -- -D warnings 2>&1) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n -e '/^error:/{' -e "N; s/^error:[[:space:]]+(.*)\\n[[:space:]]+-->[[:space:]]+(.*):([0-9]+):([0-9]+).*$/::${fault_type} file=\2,line=\3,col=\4::${fault_prefix}: \`cargo clippy\`: \1 (file:'\2', line:\3)/p;" -e '}' ; fault=true ; }
+          if [[ "${{ matrix.job.features }}" == "all" ]]; then
+            extra="--all-features"
+          else
+            extra="--features ${{ matrix.job.features }}"
+          fi
+          case '${{ matrix.job.workspace-tests }}' in
+          1|t|true|y|yes)
+            extra="${extra} --workspace"
+            ;;
+          esac
+          S=$(cargo clippy --all-targets $extra --tests -pcoreutils -- -D warnings 2>&1) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n -e '/^error:/{' -e "N; s/^error:[[:space:]]+(.*)\\n[[:space:]]+-->[[:space:]]+(.*):([0-9]+):([0-9]+).*$/::${fault_type} file=\2,line=\3,col=\4::${fault_prefix}: \`cargo clippy\`: \1 (file:'\2', line:\3)/p;" -e '}' ; fault=true ; }
           if [ -n "${{ steps.vars.outputs.FAIL_ON_FAULT }}" ] && [ -n "$fault" ]; then exit 1 ; fi
 
   style_spellcheck:

.github/workflows/freebsd.yml

@@ -24,7 +24,7 @@ jobs:
   style:
     name: Style and Lint
     runs-on: ${{ matrix.job.os }}
-    timeout-minutes: 90
+    timeout-minutes: 45
     strategy:
       fail-fast: false
       matrix:
@@ -117,7 +117,7 @@ jobs:
   test:
     name: Tests
     runs-on: ${{ matrix.job.os }}
-    timeout-minutes: 90
+    timeout-minutes: 45
     strategy:
       fail-fast: false
       matrix:

.pre-commit-config.yaml

@@ -1,23 +1,43 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
 repos:
--   repo: local
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
     hooks:
-    -   id: rust-linting
+      - id: check-added-large-files
+      - id: check-executables-have-shebangs
+      - id: check-json
+      - id: check-shebang-scripts-are-executable
+        exclude: '.+\.rs' # would be triggered by #![some_attribute]
+      - id: check-symlinks
+      - id: check-toml
+      - id: check-yaml
+        args: [ --allow-multiple-documents ]
+      - id: destroyed-symlinks
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+        args: [ --fix=lf ]
+      - id: trailing-whitespace
+
+  - repo: local
+    hooks:
+      - id: rust-linting
         name: Rust linting
         description: Run cargo fmt on files included in the commit.
         entry: cargo +stable fmt --
         pass_filenames: true
         types: [file, rust]
         language: system
-    -   id: rust-clippy
+      - id: rust-clippy
         name: Rust clippy
         description: Run cargo clippy on files included in the commit.
-        entry: cargo +stable clippy --workspace --all-targets --all-features --
+        entry: cargo +stable clippy --workspace --all-targets --all-features -- -D warnings
         pass_filenames: false
         types: [file, rust]
         language: system
-    -   id: cspell
+      - id: cspell
         name: Code spell checker (cspell)
         description: Run cspell to check for spelling errors.
-        entry: cspell --
+        entry: cspell --no-must-find-files --
         pass_filenames: true
         language: system

.vscode/cSpell.json

@@ -26,7 +26,8 @@
     "tests/**/fixtures/**",
     "src/uu/dd/test-resources/**",
     "vendor/**",
-    "**/*.svg"
+    "**/*.svg",
+    "src/uu/*/locales/*.ftl"
   ],
 
   "enableGlobDot": true,