Skip to content

Commit e222f6c

Browse files
sylvestresylvestre
authored
Merge branch 'main' into spotlight
2 parents caf6e30 + e061f8e commit e222f6c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1853
-555
lines changed

‎.github/workflows/CICD.yml‎

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ jobs:
101101
env:
102102
SCCACHE_GHA_ENABLED: "true"
103103
RUSTC_WRAPPER: "sccache"
104+
CARGO_INCREMENTAL: 0
104105
strategy:
105106
fail-fast: false
106107
matrix:
@@ -166,6 +167,7 @@ jobs:
166167
env:
167168
SCCACHE_GHA_ENABLED: "true"
168169
RUSTC_WRAPPER: "sccache"
170+
CARGO_INCREMENTAL: 0
169171
strategy:
170172
matrix:
171173
job:
@@ -272,6 +274,7 @@ jobs:
272274
env:
273275
SCCACHE_GHA_ENABLED: "true"
274276
RUSTC_WRAPPER: "sccache"
277+
CARGO_INCREMENTAL: 0
275278
strategy:
276279
fail-fast: false
277280
matrix:
@@ -408,6 +411,7 @@ jobs:
408411
env:
409412
SCCACHE_GHA_ENABLED: "true"
410413
RUSTC_WRAPPER: "sccache"
414+
CARGO_INCREMENTAL: 0
411415
strategy:
412416
fail-fast: false
413417
matrix:
@@ -450,6 +454,7 @@ jobs:
450454
env:
451455
SCCACHE_GHA_ENABLED: "true"
452456
RUSTC_WRAPPER: "sccache"
457+
CARGO_INCREMENTAL: 0
453458
strategy:
454459
fail-fast: false
455460
matrix:
@@ -493,6 +498,7 @@ jobs:
493498
env:
494499
SCCACHE_GHA_ENABLED: "true"
495500
RUSTC_WRAPPER: "sccache"
501+
CARGO_INCREMENTAL: 0
496502
strategy:
497503
fail-fast: false
498504
matrix:
@@ -619,6 +625,7 @@ jobs:
619625
DOCKER_OPTS: '--volume /etc/passwd:/etc/passwd --volume /etc/group:/etc/group'
620626
SCCACHE_GHA_ENABLED: "true"
621627
RUSTC_WRAPPER: "sccache"
628+
CARGO_INCREMENTAL: 0
622629
strategy:
623630
fail-fast: false
624631
matrix:
@@ -932,6 +939,7 @@ jobs:
932939
env:
933940
SCCACHE_GHA_ENABLED: "true"
934941
RUSTC_WRAPPER: "sccache"
942+
CARGO_INCREMENTAL: 0
935943
strategy:
936944
fail-fast: false
937945
matrix:
@@ -1013,6 +1021,7 @@ jobs:
10131021
env:
10141022
SCCACHE_GHA_ENABLED: "true"
10151023
RUSTC_WRAPPER: "sccache"
1024+
CARGO_INCREMENTAL: 0
10161025
strategy:
10171026
fail-fast: false
10181027
matrix:
@@ -1106,6 +1115,7 @@ jobs:
11061115
env:
11071116
SCCACHE_GHA_ENABLED: "true"
11081117
RUSTC_WRAPPER: "sccache"
1118+
CARGO_INCREMENTAL: 0
11091119
strategy:
11101120
fail-fast: false
11111121
matrix:
@@ -1230,7 +1240,7 @@ jobs:
12301240
fail_ci_if_error: false
12311241

12321242
test_separately:
1233-
name: Separate Builds
1243+
name: Separate Builds (individual and coreutils)# duplicated with other CI, but has better appearance
12341244
runs-on: ${{ matrix.job.os }}
12351245
strategy:
12361246
fail-fast: false
@@ -1246,48 +1256,21 @@ jobs:
12461256
- uses: actions/checkout@v6
12471257
with:
12481258
persist-credentials: false
1259+
- name: Avoid no space left on device
1260+
run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android &
12491261
- uses: dtolnay/rust-toolchain@stable
12501262
- uses: Swatinem/rust-cache@v2
1251-
- name: build and test all programs individually
1252-
shell: bash
1253-
run: |
1254-
CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
1255-
for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
1256-
do
1257-
echo "Building and testing $f"
1258-
cargo test -p "uu_$f"
1259-
done
1260-
1261-
test_all_features:
1262-
name: Test all features separately
1263-
needs: [ min_version, deps ]
1264-
runs-on: ${{ matrix.job.os }}
1265-
strategy:
1266-
fail-fast: false
1267-
matrix:
1268-
job:
1269-
- { os: ubuntu-latest , features: feat_os_unix }
1270-
- { os: macos-latest , features: feat_os_macos }
1271-
# - { os: windows-latest , features: feat_os_windows } https://github.com/uutils/coreutils/issues/7044
1272-
steps:
12731263
- name: Disable spotlight
12741264
if: runner.os == 'macOS'
12751265
run : sudo mdutil -a -i off &
1276-
- uses: actions/checkout@v6
1277-
with:
1278-
persist-credentials: false
1279-
- name: Avoid no space left on device
1280-
run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android &
1281-
- uses: dtolnay/rust-toolchain@stable
1282-
- uses: Swatinem/rust-cache@v2
1283-
- name: build and test all features individually
1266+
- name: build and test all programs individually
12841267
shell: bash
12851268
run: |
12861269
CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
12871270
for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
12881271
do
1289-
echo "Running tests with --features=$f and --no-default-features"
1290-
cargo test --features=$f --no-default-features
1272+
echo "Building and testing $f"
1273+
cargo test -p "uu_$f" -p coreutils --features=$f --no-default-features
12911274
done
12921275
12931276
test_selinux:

‎.github/workflows/benchmarks.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ jobs:
2020
benchmarks:
2121
name: Run ${{ matrix.type }} benchmarks for ${{ matrix.package }} (CodSpeed)
2222
runs-on: ubuntu-latest
23+
env:
24+
RUSTC_WRAPPER: sccache
25+
CARGO_INCREMENTAL: 0
26+
SCCACHE_GHA_ENABLED: "true"
2327
strategy:
2428
matrix:
2529
type: [simulation] # , memory] # memory profile disabled due to variance

‎.github/workflows/code-quality.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ jobs:
7474
env:
7575
SCCACHE_GHA_ENABLED: "true"
7676
RUSTC_WRAPPER: "sccache"
77+
CARGO_INCREMENTAL: 0
7778
strategy:
7879
fail-fast: false
7980
matrix:
@@ -150,6 +151,12 @@ jobs:
150151
CARGO_UTILITY_LIST_OPTIONS="$(for u in ${UTILITY_LIST}; do echo -n "-puu_${u} "; done;)"
151152
S=$(cargo clippy --all-targets $extra --tests --benches -pcoreutils ${CARGO_UTILITY_LIST_OPTIONS} -- -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 ; }
152153
if [ -n "${{ steps.vars.outputs.FAIL_ON_FAULT }}" ] && [ -n "$fault" ]; then exit 1 ; fi
154+
- name: "cargo clippy on fuzz dir"
155+
if: runner.os != 'Windows'
156+
shell: bash
157+
run: |
158+
cd fuzz
159+
cargo clippy --workspace --all-targets --all-features -- -D warnings
153160
154161
style_spellcheck:
155162
name: Style/spelling

‎.github/workflows/freebsd.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jobs:
9393
# To ensure that files are cleaned up, we don't want to exit on error
9494
set +e
9595
unset FAULT
96+
export CARGO_INCREMENTAL=0
9697
## cargo fmt testing
9798
echo "## cargo fmt testing"
9899
# * convert any errors/warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>
@@ -179,6 +180,7 @@ jobs:
179180
set +e
180181
cd "${WORKSPACE}"
181182
unset FAULT
183+
export CARGO_INCREMENTAL=0
182184
export RUSTFLAGS="-C strip=symbols" # for disk space
183185
cargo build || FAULT=1
184186
export PATH=~/.cargo/bin:${PATH}

‎.github/workflows/fuzzing.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,11 @@ jobs:
9292
- { name: fuzz_env, should_pass: false }
9393
- { name: fuzz_cksum, should_pass: false }
9494
- { name: fuzz_parse_glob, should_pass: true }
95-
- { name: fuzz_parse_size, should_pass: true }
96-
- { name: fuzz_parse_time, should_pass: true }
95+
- { name: fuzz_parse_size, should_pass: false }
96+
- { name: fuzz_parse_time, should_pass: false }
9797
- { name: fuzz_seq_parse_number, should_pass: false }
9898
- { name: fuzz_non_utf8_paths, should_pass: true }
99+
- { name: fuzz_dirname, should_pass: true }
99100

100101
steps:
101102
- uses: actions/checkout@v6
@@ -117,7 +118,7 @@ jobs:
117118
- name: Run ${{ matrix.test-target.name }} for XX seconds
118119
id: run_fuzzer
119120
shell: bash
120-
continue-on-error: ${{ !matrix.test-target.name.should_pass }}
121+
continue-on-error: ${{ !matrix.test-target.should_pass }}
121122
run: |
122123
mkdir -p fuzz/stats
123124
STATS_FILE="fuzz/stats/${{ matrix.test-target.name }}.txt"
@@ -155,7 +156,7 @@ jobs:
155156
echo "Runs: $(grep -q "stat::number_of_executed_units" "$STATS_FILE" && grep "stat::number_of_executed_units" "$STATS_FILE" | awk '{print $2}' || echo "unknown")"
156157
echo "Execution Rate: $(grep -q "stat::average_exec_per_sec" "$STATS_FILE" && grep "stat::average_exec_per_sec" "$STATS_FILE" | awk '{print $2}' || echo "unknown") execs/sec"
157158
echo "New Units: $(grep -q "stat::new_units_added" "$STATS_FILE" && grep "stat::new_units_added" "$STATS_FILE" | awk '{print $2}' || echo "unknown")"
158-
echo "Expected: ${{ matrix.test-target.name.should_pass }}"
159+
echo "Expected: ${{ matrix.test-target.should_pass }}"
159160
if grep -q "SUMMARY: " "$STATS_FILE"; then
160161
echo "Status: $(grep "SUMMARY: " "$STATS_FILE" | head -1)"
161162
else

‎.github/workflows/l10n.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
env:
2929
SCCACHE_GHA_ENABLED: "true"
3030
RUSTC_WRAPPER: "sccache"
31+
CARGO_INCREMENTAL: 0
3132
strategy:
3233
fail-fast: false
3334
matrix:
@@ -133,6 +134,7 @@ jobs:
133134
env:
134135
SCCACHE_GHA_ENABLED: "true"
135136
RUSTC_WRAPPER: "sccache"
137+
CARGO_INCREMENTAL: 0
136138
steps:
137139
- uses: actions/checkout@v6
138140
with:
@@ -303,6 +305,7 @@ jobs:
303305
env:
304306
SCCACHE_GHA_ENABLED: "true"
305307
RUSTC_WRAPPER: "sccache"
308+
CARGO_INCREMENTAL: 0
306309
steps:
307310
- uses: actions/checkout@v6
308311
with:
@@ -412,6 +415,7 @@ jobs:
412415
env:
413416
SCCACHE_GHA_ENABLED: "true"
414417
RUSTC_WRAPPER: "sccache"
418+
CARGO_INCREMENTAL: 0
415419
strategy:
416420
fail-fast: false
417421
matrix:
@@ -566,6 +570,7 @@ jobs:
566570
env:
567571
SCCACHE_GHA_ENABLED: "true"
568572
RUSTC_WRAPPER: "sccache"
573+
CARGO_INCREMENTAL: 0
569574
strategy:
570575
fail-fast: false
571576
matrix:
@@ -908,6 +913,7 @@ jobs:
908913
env:
909914
SCCACHE_GHA_ENABLED: "true"
910915
RUSTC_WRAPPER: "sccache"
916+
CARGO_INCREMENTAL: 0
911917
steps:
912918
- uses: actions/checkout@v6
913919
with:
@@ -1139,6 +1145,7 @@ jobs:
11391145
env:
11401146
SCCACHE_GHA_ENABLED: "true"
11411147
RUSTC_WRAPPER: "sccache"
1148+
CARGO_INCREMENTAL: 0
11421149
steps:
11431150
- uses: actions/checkout@v6
11441151
with:
@@ -1260,6 +1267,7 @@ jobs:
12601267
env:
12611268
SCCACHE_GHA_ENABLED: "true"
12621269
RUSTC_WRAPPER: "sccache"
1270+
CARGO_INCREMENTAL: 0
12631271
steps:
12641272
- uses: actions/checkout@v6
12651273
with:

‎.github/workflows/openbsd.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
# * NOTE: All steps need to be run in this block, otherwise, we are operating back on the mac host
5959
set -e
6060
#
61+
export CARGO_INCREMENTAL=0
6162
TEST_USER=tester
6263
REPO_NAME=${GITHUB_WORKSPACE##*/}
6364
WORKSPACE_PARENT="/home/runner/work/${REPO_NAME}"
@@ -153,6 +154,7 @@ jobs:
153154
# * NOTE: All steps need to be run in this block, otherwise, we are operating back on the mac host
154155
set -e
155156
#
157+
export CARGO_INCREMENTAL=0
156158
TEST_USER=tester
157159
REPO_NAME=${GITHUB_WORKSPACE##*/}
158160
WORKSPACE_PARENT="/home/runner/work/${REPO_NAME}"

‎.github/workflows/wsl2.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,5 @@ jobs:
6666
. "$HOME/.cargo/env"
6767
export CARGO_TERM_COLOR=always
6868
export RUST_BACKTRACE=1
69+
CARGO_INCREMENTAL=0
6970
cargo nextest run --hide-progress-bar --profile ci --features '${{ matrix.job.features }}'

‎.vscode/cspell.dictionaries/jargon.wordlist.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ fileio
5555
filesystem
5656
filesystems
5757
flamegraph
58+
footgun
5859
freeram
5960
fsxattr
6061
fullblock
@@ -93,6 +94,7 @@ mergeable
9394
microbenchmark
9495
microbenchmarks
9596
microbenchmarking
97+
monomorphized
9698
multibyte
9799
multicall
98100
nmerge
@@ -107,6 +109,7 @@ nolinks
107109
nonblock
108110
nonportable
109111
nonprinting
112+
nonrepeating
110113
nonseekable
111114
notrunc
112115
nowrite

‎.vscode/cspell.dictionaries/people.wordlist.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ Boden Garman
3737
Chirag B Jadwani
3838
Chirag
3939
Jadwani
40+
Daniel Lemire
41+
Daniel
42+
Lemire
4043
Derek Chiang
4144
Derek
4245
Chiang

0 commit comments

Comments
 (0)