Merge branch 'uutils:main' into Fix-both-files-can-return-an-error

Author: GunterSchmidt

.github/workflows/ci.yml

@@ -57,11 +57,15 @@ jobs:
       - run: cargo clippy -- -D warnings
 
   gnu-testsuite:
+    permissions:
+      contents: write # Publish diffutils instead of discarding
     name: GNU test suite
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: cargo build --release
+      - run: |
+          cargo build --config=profile.release.strip=true --profile=release #-fast
+          zstd -19 target/release/diffutils -o diffutils-x86_64-unknown-linux-gnu.zst
       # do not fail, the report is merely informative (at least until all tests pass reliably)
       - run: ./tests/run-upstream-testsuite.sh release || true
         env:
@@ -71,6 +75,17 @@ jobs:
           name: test-results.json
           path: tests/test-results.json
       - run: ./tests/print-test-results.sh tests/test-results.json
+      - name: Publish latest commit
+        uses: softprops/action-gh-release@v2
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        with:
+          tag_name: latest-commit
+          draft: false
+          prerelease: true
+          files: |
+            diffutils-x86_64-unknown-linux-gnu.zst
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   coverage:
     name: Code Coverage

.github/workflows/codspeed.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup rust toolchain, cache and cargo-codspeed binary
-        uses: moonrepo/setup-rust@v0
+        uses: moonrepo/setup-rust@v1
         with:
           channel: stable
           cache-target: release

.github/workflows/fuzzing.yml

@@ -21,15 +21,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@nightly
       - name: Install `cargo-fuzz`
-        run: cargo install cargo-fuzz
+        run: |
+          echo "RUSTC_BOOTSTRAP=1" >> "${GITHUB_ENV}"
+          echo "CARGO_INCREMENTAL=0" >> "${GITHUB_ENV}"
+          cargo install cargo-fuzz --locked
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: "cargo-fuzz-cache-key"
           cache-directories: "fuzz/target"
       - name: Run `cargo-fuzz build`
-        run: cargo +nightly fuzz build
+        run: cargo fuzz build
 
   fuzz-run:
     needs: fuzz-build
@@ -49,9 +51,11 @@ jobs:
           - { name: fuzz_side, should_pass: true }
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@nightly
       - name: Install `cargo-fuzz`
-        run: cargo install cargo-fuzz
+        run: |
+          echo "RUSTC_BOOTSTRAP=1" >> "${GITHUB_ENV}"
+          echo "CARGO_INCREMENTAL=0" >> "${GITHUB_ENV}"
+          cargo install cargo-fuzz --locked
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: "cargo-fuzz-cache-key"
@@ -66,7 +70,7 @@ jobs:
         shell: bash
         continue-on-error: ${{ !matrix.test-target.name.should_pass }}
         run: |
-          cargo +nightly fuzz run ${{ matrix.test-target.name }} -- -max_total_time=${{ env.RUN_FOR }} -detect_leaks=0
+          cargo fuzz run ${{ matrix.test-target.name }} -- -max_total_time=${{ env.RUN_FOR }} -detect_leaks=0
       - name: Save Corpus Cache
         uses: actions/cache/save@v5
         with:

src/cmp.rs

@@ -1085,6 +1085,9 @@ mod tests {
                 from: os("foo"),
                 to: os("bar"),
                 skip_a: Some(1_000_000_000),
+                #[cfg(target_pointer_width = "32")]
+                skip_b: Some((2_147_483_647.5 * 2.0) as usize),
+                #[cfg(target_pointer_width = "64")]
                 skip_b: Some(1_152_921_504_606_846_976 * 2),
                 ..Default::default()
             }),