Merge branch 'main' into cksum-new

Author: sylvestre

.cargo/config.toml

@@ -12,3 +12,12 @@ rustflags = ["-C", "target-feature=+crt-static"]
 [env]
 # See feat_external_libstdbuf in src/uu/stdbuf/Cargo.toml
 LIBSTDBUF_DIR = "/usr/local/libexec/coreutils"
+
+# remove me
+[build]
+rustflags = [
+  "-A",
+  "clippy::collapsible_if",
+  "-A",
+  "clippy::manual_is_multiple_of",
+]

.clippy.toml

@@ -1,4 +1,3 @@
-msrv = "1.85.0"
 avoid-breaking-exported-api = false
 check-private-items = true
 cognitive-complexity-threshold = 24

.github/workflows/CICD.yml

@@ -11,7 +11,7 @@ env:
   PROJECT_NAME: coreutils
   PROJECT_DESC: "Core universal (cross-platform) utilities"
   PROJECT_AUTH: "uutils"
-  RUST_MIN_SRV: "1.85.0"
+  RUST_MIN_SRV: "1.88.0"
   # * style job configuration
   STYLE_FAIL_ON_FAULT: true ## (bool) fail the build if a style job contains a fault (error or warning); may be overridden on a per-job basis
 
@@ -548,14 +548,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@v13
+      uses: dawidd6/action-download-artifact@v14
       with:
         workflow: CICD.yml
         name: individual-size-result
         repo: uutils/coreutils
         path: dl
     - name: Download the previous size result
-      uses: dawidd6/action-download-artifact@v13
+      uses: dawidd6/action-download-artifact@v14
       with:
         workflow: CICD.yml
         name: size-result
@@ -701,7 +701,11 @@ jobs:
         outputs TARGET_ARCH TARGET_OS
         # package name
         PKG_suffix=".tar.gz" ; case '${{ matrix.job.target }}' in *-pc-windows-*) PKG_suffix=".zip" ;; esac;
-        PKG_BASENAME=${PROJECT_NAME}-${{ matrix.job.target }}
+        # Some 3rd party utils need version at file names
+        # But we remove it from tag/latest-commit
+        test ${REF_TAG} \
+          && PKG_BASENAME=${PROJECT_NAME}-${REF_TAG}-${{ matrix.job.target }} \
+          || PKG_BASENAME=${PROJECT_NAME}-${{ matrix.job.target }}
         PKG_NAME=${PKG_BASENAME}${PKG_suffix}
         outputs PKG_suffix PKG_BASENAME PKG_NAME
         # deployable tag? (ie, leading "vM" or "M"; M == version number)
@@ -841,12 +845,6 @@ jobs:
         echo "## dependency list"
         cargo fetch --locked --quiet --target $(rustc --print host-tuple)
         cargo tree --locked --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} ${{ steps.vars.outputs.CARGO_DEFAULT_FEATURES_OPTION }} --no-dedupe -e=no-dev --prefix=none | grep -vE "$PWD" | sort --unique
-    - name: Build
-      shell: bash
-      run: |
-        ## Build
-        ${{ steps.vars.outputs.CARGO_CMD }} ${{ steps.vars.outputs.CARGO_CMD_OPTIONS }} build --release --config=profile.release.strip=true \
-        --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} ${{ steps.vars.outputs.CARGO_DEFAULT_FEATURES_OPTION }}
     - name: Test
       if: matrix.job.skip-tests != true
       shell: bash
@@ -857,13 +855,15 @@ jobs:
         ${{ steps.dep_vars.outputs.CARGO_UTILITY_LIST_OPTIONS }} -p coreutils
       env:
         RUST_BACKTRACE: "1"
-    - name: Archive executable artifacts
-      uses: actions/upload-artifact@v6
-      with:
-        name: ${{ env.PROJECT_NAME }}-${{ matrix.job.target }}${{ steps.vars.outputs.ARTIFACTS_SUFFIX }}
-        path: target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}
+    - name: Build
+      shell: bash
+      if: matrix.job.skip-publish != true
+      run: |
+        ## Build
+        ${{ steps.vars.outputs.CARGO_CMD }} ${{ steps.vars.outputs.CARGO_CMD_OPTIONS }} build --release --config=profile.release.strip=true \
+        --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} ${{ steps.vars.outputs.CARGO_DEFAULT_FEATURES_OPTION }}
     - name: Package
-      if: matrix.job.skip-package != true
+      if: matrix.job.skip-publish != true
       shell: bash
       run: |
         ## Package artifact(s)
@@ -910,6 +910,8 @@ jobs:
       if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.job.skip-publish != true
       with:
         tag_name: latest-commit
+        body: |
+          commit: ${{ github.sha }}
         draft: false
         prerelease: true
         files: |
@@ -1225,7 +1227,8 @@ jobs:
         fail_ci_if_error: false
 
   test_separately:
-    name: Separate Builds (individual and coreutils)# duplicated with other CI, but has better appearance
+    # duplicated with other CI, but has better appearance
+    name: Separate Builds (individual and coreutils)
     runs-on: ${{ matrix.job.os }}
     strategy:
       fail-fast: false

.github/workflows/GnuComment.yml

@@ -59,4 +59,4 @@ jobs:
                 issue_number: issue_number,
                 body: 'GNU testsuite comparison:\n```\n' + content + '```'
               });
-            } 
+            }

.github/workflows/GnuTests.yml

@@ -372,7 +372,7 @@ jobs:
         path: 'uutils'
         persist-credentials: false
     - name: Retrieve reference artifacts
-      uses: dawidd6/action-download-artifact@v13
+      uses: dawidd6/action-download-artifact@v14
       # 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:

.github/workflows/benchmarks.yml

@@ -26,7 +26,7 @@ jobs:
       SCCACHE_GHA_ENABLED: "true"
     strategy:
       matrix:
-        type: [simulation] # , memory]  # memory profile disabled due to variance
+        type: [simulation, memory]
         package: [
           uu_base64,
           uu_cksum,

.github/workflows/freebsd.yml

@@ -35,7 +35,7 @@ jobs:
       with:
         persist-credentials: false
     - name: Prepare, build and test
-      uses: vmactions/freebsd-vm@v1.2.9
+      uses: vmactions/freebsd-vm@v1.3.9
       with:
         usesh: true
         sync: rsync
@@ -127,7 +127,7 @@ jobs:
     - name: Avoid no space left on device (Ubuntu runner)
       run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android &
     - name: Prepare, build and test
-      uses: vmactions/freebsd-vm@v1.2.9
+      uses: vmactions/freebsd-vm@v1.3.9
       with:
         usesh: true
         sync: rsync

.github/workflows/fuzzing.yml

@@ -1,6 +1,7 @@
 name: Fuzzing
 
-# spell-checker:ignore fuzzer dtolnay Swatinem
+# spell-checker:ignore (people) dtolnay Swatinem taiki-e
+# spell-checker:ignore (misc) fuzzer
 
 on:
   pull_request:
@@ -19,16 +20,13 @@ concurrency:
 jobs:
   uufuzz-examples:
     name: Build and test uufuzz examples
+    env:
+      CARGO_INCREMENTAL: 0
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v6
       with:
         persist-credentials: false
-    - uses: dtolnay/rust-toolchain@stable
-    - uses: Swatinem/rust-cache@v2
-      with:
-        shared-key: "uufuzz-cache-key"
-        cache-directories: "fuzz/target"
     - name: Build uufuzz library
       run: |
         cd fuzz/uufuzz
@@ -59,15 +57,16 @@ jobs:
       with:
         persist-credentials: false
     - name: Install `cargo-fuzz`
-      run: |
-        echo "RUSTC_BOOTSTRAP=1" >> "${GITHUB_ENV}" # Use -Z
-        cargo install cargo-fuzz --locked
-    - uses: Swatinem/rust-cache@v2
+      uses: taiki-e/install-action@v2
       with:
-        shared-key: "cargo-fuzz-cache-key"
-        cache-directories: "fuzz/target"
+        tool: cargo-fuzz
+    - name: Emulate a nightly toolchain
+      run: |
+        echo "RUSTC_BOOTSTRAP=1" >> "${GITHUB_ENV}"
     - name: Run `cargo-fuzz build`
-      run: cargo fuzz build
+      # Force the correct target
+      # https://github.com/rust-fuzz/cargo-fuzz/issues/398
+      run: cargo fuzz build --target $(rustc --print host-tuple)
 
   fuzz-run:
     needs: fuzz-build
@@ -76,6 +75,7 @@ jobs:
     timeout-minutes: 5
     env:
       RUN_FOR: 60
+      CARGO_INCREMENTAL: 0
     strategy:
       matrix:
         test-target:
@@ -104,27 +104,22 @@ jobs:
       with:
         persist-credentials: false
     - name: Install `cargo-fuzz`
-      run: |
-        echo "RUSTC_BOOTSTRAP=1" >> "${GITHUB_ENV}" # Use nightly
-        cargo install cargo-fuzz --locked
-    - uses: Swatinem/rust-cache@v2
+      uses: taiki-e/install-action@v2
       with:
-        shared-key: "cargo-fuzz-cache-key"
-        cache-directories: "fuzz/target"
-    - name: Restore Cached Corpus
-      uses: actions/cache/restore@v5
-      with:
-        key: corpus-cache-${{ matrix.test-target.name }}
-        path: |
-          fuzz/corpus/${{ matrix.test-target.name }}
+        tool: cargo-fuzz
+    - name: Emulate a nightly toolchain
+      run: |
+        echo "RUSTC_BOOTSTRAP=1" >> "${GITHUB_ENV}"
     - name: Run ${{ matrix.test-target.name }} for XX seconds
       id: run_fuzzer
       shell: bash
       continue-on-error: ${{ !matrix.test-target.should_pass }}
       run: |
         mkdir -p fuzz/stats
         STATS_FILE="fuzz/stats/${{ matrix.test-target.name }}.txt"
-        cargo fuzz run ${{ matrix.test-target.name }} -- -max_total_time=${{ env.RUN_FOR }} -timeout=${{ env.RUN_FOR }} -detect_leaks=0 -print_final_stats=1 2>&1 | tee "$STATS_FILE"
+        # Force the correct target
+        # https://github.com/rust-fuzz/cargo-fuzz/issues/398
+        cargo fuzz run --target $(rustc --print host-tuple) ${{ matrix.test-target.name }} -- -max_total_time=${{ env.RUN_FOR }} -timeout=${{ env.RUN_FOR }} -detect_leaks=0 -print_final_stats=1 2>&1 | tee "$STATS_FILE"
 
         # Extract key stats from the output
         if grep -q "stat::number_of_executed_units" "$STATS_FILE"; then
@@ -193,12 +188,6 @@ jobs:
         fi
 
         echo "" >> $GITHUB_STEP_SUMMARY
-    - name: Save Corpus Cache
-      uses: actions/cache/save@v5
-      with:
-        key: corpus-cache-${{ matrix.test-target.name }}
-        path: |
-          fuzz/corpus/${{ matrix.test-target.name }}
     - name: Upload Stats
       uses: actions/upload-artifact@v6
       with:

.gitignore

@@ -21,3 +21,5 @@ lib*.a
 
 ### direnv ###
 /.direnv/
+
+*.code-workspace

.markdownlint.yaml

@@ -3,4 +3,3 @@ MD013: false
 # Disable 'Fenced code blocks should have a language specified'
 # Doesn't provide much in src/ to enforce it
 MD040: false
-