From 7253a183eb01593d706ea7db41ca28d11b221785 Mon Sep 17 00:00:00 2001 From: Hamdy Abou El Anein Date: Tue, 3 Nov 2026 13:04:38 +0100 Subject: [PATCH 1/2] fix(ci): resolve lint, formatting, fork workflow failures --- .github/workflows/android.yml | 3 +++ .github/workflows/benchmarks.yml | 4 +++- .github/workflows/wsl2.yml | 7 ++++++- hamdy-tools/build.sh | 0 hamdy-tools/install-locales.sh | 0 hamdy-tools/test-upstream-environment.sh | 0 hamdy-tools/test-upstream.sh | 0 src/uu/pr/src/pr.rs | 5 ++++- vendor/num-prime/Cargo.toml | 19 +++---------------- 9 files changed, 19 insertions(+), 19 deletions(-) mode change 100644 => 100755 hamdy-tools/build.sh mode change 100644 => 100755 hamdy-tools/install-locales.sh mode change 100644 => 100755 hamdy-tools/test-upstream-environment.sh mode change 100644 => 100755 hamdy-tools/test-upstream.sh diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 60e1ca0..71b323f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -29,6 +29,9 @@ env: jobs: test_android: + # The upstream emulator job needs runner/KVM resources not reliably + # available to forks; retain the workflow for upstream builds. + if: github.repository == 'uutils/coreutils' name: Test builds timeout-minutes: 90 strategy: diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 8082b5d..4894968 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -65,7 +65,9 @@ jobs: benchmarks: needs: detects-benchmarks - if: needs.detects-benchmarks.outputs.package != '[]' + # CodSpeed uploads require an organization-linked project; forks receive + # HTTP 401 and cannot publish measurements to the upstream project. + if: github.repository == 'uutils/coreutils' && needs.detects-benchmarks.outputs.package != '[]' name: Run ${{ matrix.type }} benchmarks for ${{ matrix.package }} (CodSpeed) runs-on: ubuntu-latest timeout-minutes: 90 diff --git a/.github/workflows/wsl2.yml b/.github/workflows/wsl2.yml index 10b3db8..5839100 100644 --- a/.github/workflows/wsl2.yml +++ b/.github/workflows/wsl2.yml @@ -48,7 +48,12 @@ jobs: shell: wsl-bash {0} run: | mkdir -p "$HOME/src" - curl -L https://github.com/uutils/coreutils/archive/${{ github.sha }}.tar.gz | tar -xzf - --strip-components=1 -C "$HOME/src" + # Use the actual repository: a fork's commit SHA is not available + # in the upstream uutils/coreutils source archive. + curl --fail --location --silent --show-error \ + "https://github.com/${{ github.repository }}/archive/${{ github.sha }}.tar.gz" \ + -o "$HOME/coreutils-source.tar.gz" + tar -xzf "$HOME/coreutils-source.tar.gz" --strip-components=1 -C "$HOME/src" - name: Install rust and nextest shell: wsl-bash {0} run: | diff --git a/hamdy-tools/build.sh b/hamdy-tools/build.sh old mode 100644 new mode 100755 diff --git a/hamdy-tools/install-locales.sh b/hamdy-tools/install-locales.sh old mode 100644 new mode 100755 diff --git a/hamdy-tools/test-upstream-environment.sh b/hamdy-tools/test-upstream-environment.sh old mode 100644 new mode 100755 diff --git a/hamdy-tools/test-upstream.sh b/hamdy-tools/test-upstream.sh old mode 100644 new mode 100755 diff --git a/src/uu/pr/src/pr.rs b/src/uu/pr/src/pr.rs index 942f6f8..68bf5bd 100644 --- a/src/uu/pr/src/pr.rs +++ b/src/uu/pr/src/pr.rs @@ -1768,7 +1768,10 @@ fn render_nonprinting(bytes: &[u8], octal: bool) -> String { }); } 0..=31 | 127 | 128..=255 => { - output.push_str(&format!("\\{byte:03o}")); + output.push('\\'); + output.push(char::from(b'0' + ((byte >> 6) & 7))); + output.push(char::from(b'0' + ((byte >> 3) & 7))); + output.push(char::from(b'0' + (byte & 7))); } _ => output.push(char::from(byte)), } diff --git a/vendor/num-prime/Cargo.toml b/vendor/num-prime/Cargo.toml index f16d9eb..4ed1769 100644 --- a/vendor/num-prime/Cargo.toml +++ b/vendor/num-prime/Cargo.toml @@ -25,18 +25,8 @@ Generic and optimized primality test, factorization and various number theoretic """ documentation = "https://docs.rs/num-prime" readme = "README.md" -keywords = [ - "bigint", - "mathematics", - "num", - "number-theory", - "primes", -] -categories = [ - "algorithms", - "cryptography", - "science", -] +keywords = ["bigint", "mathematics", "num", "number-theory", "primes"] +categories = ["algorithms", "cryptography", "science"] license = "MIT OR Apache-2.0" repository = "https://github.com/uutils/num-prime" @@ -46,10 +36,7 @@ all-features = true [features] big-int = ["dep:num-bigint"] big-table = [] -default = [ - "big-int", - "big-table", -] +default = ["big-int", "big-table"] [lib] name = "num_prime" From e3f0c823c1223906dc010b8efa15545039001ca7 Mon Sep 17 00:00:00 2001 From: Hamdy Abou El Anein Date: Tue, 3 Nov 2026 13:05:44 +0100 Subject: [PATCH 2/2] fix(ci): mark Python helper scripts executable --- hamdy-tools/tests/options.py | 0 hamdy-tools/tests/verify.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 hamdy-tools/tests/options.py mode change 100644 => 100755 hamdy-tools/tests/verify.py diff --git a/hamdy-tools/tests/options.py b/hamdy-tools/tests/options.py old mode 100644 new mode 100755 diff --git a/hamdy-tools/tests/verify.py b/hamdy-tools/tests/verify.py old mode 100644 new mode 100755