Skip to content

Commit c26dc1c

Browse files
mattsu2020mattsu2020
authored
Merge branch 'main' into factor_fix
2 parents bc8bc51 + d2db872 commit c26dc1c

File tree

28 files changed

+1269
-132
lines changed

28 files changed

+1269
-132
lines changed

‎.github/workflows/CICD.yml‎

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ jobs:
9898
env:
9999
SCCACHE_GHA_ENABLED: "true"
100100
RUSTC_WRAPPER: "sccache"
101+
CARGO_INCREMENTAL: 0
101102
strategy:
102103
fail-fast: false
103104
matrix:
@@ -163,6 +164,7 @@ jobs:
163164
env:
164165
SCCACHE_GHA_ENABLED: "true"
165166
RUSTC_WRAPPER: "sccache"
167+
CARGO_INCREMENTAL: 0
166168
strategy:
167169
matrix:
168170
job:
@@ -269,6 +271,7 @@ jobs:
269271
env:
270272
SCCACHE_GHA_ENABLED: "true"
271273
RUSTC_WRAPPER: "sccache"
274+
CARGO_INCREMENTAL: 0
272275
strategy:
273276
fail-fast: false
274277
matrix:
@@ -405,6 +408,7 @@ jobs:
405408
env:
406409
SCCACHE_GHA_ENABLED: "true"
407410
RUSTC_WRAPPER: "sccache"
411+
CARGO_INCREMENTAL: 0
408412
strategy:
409413
fail-fast: false
410414
matrix:
@@ -444,6 +448,7 @@ jobs:
444448
env:
445449
SCCACHE_GHA_ENABLED: "true"
446450
RUSTC_WRAPPER: "sccache"
451+
CARGO_INCREMENTAL: 0
447452
strategy:
448453
fail-fast: false
449454
matrix:
@@ -484,6 +489,7 @@ jobs:
484489
env:
485490
SCCACHE_GHA_ENABLED: "true"
486491
RUSTC_WRAPPER: "sccache"
492+
CARGO_INCREMENTAL: 0
487493
strategy:
488494
fail-fast: false
489495
matrix:
@@ -610,6 +616,7 @@ jobs:
610616
DOCKER_OPTS: '--volume /etc/passwd:/etc/passwd --volume /etc/group:/etc/group'
611617
SCCACHE_GHA_ENABLED: "true"
612618
RUSTC_WRAPPER: "sccache"
619+
CARGO_INCREMENTAL: 0
613620
strategy:
614621
fail-fast: false
615622
matrix:
@@ -920,6 +927,7 @@ jobs:
920927
env:
921928
SCCACHE_GHA_ENABLED: "true"
922929
RUSTC_WRAPPER: "sccache"
930+
CARGO_INCREMENTAL: 0
923931
strategy:
924932
fail-fast: false
925933
matrix:
@@ -1001,6 +1009,7 @@ jobs:
10011009
env:
10021010
SCCACHE_GHA_ENABLED: "true"
10031011
RUSTC_WRAPPER: "sccache"
1012+
CARGO_INCREMENTAL: 0
10041013
strategy:
10051014
fail-fast: false
10061015
matrix:
@@ -1094,6 +1103,7 @@ jobs:
10941103
env:
10951104
SCCACHE_GHA_ENABLED: "true"
10961105
RUSTC_WRAPPER: "sccache"
1106+
CARGO_INCREMENTAL: 0
10971107
strategy:
10981108
fail-fast: false
10991109
matrix:
@@ -1218,7 +1228,7 @@ jobs:
12181228
fail_ci_if_error: false
12191229

12201230
test_separately:
1221-
name: Separate Builds
1231+
name: Separate Builds (individual and coreutils)# duplicated with other CI, but has better appearance
12221232
runs-on: ${{ matrix.job.os }}
12231233
strategy:
12241234
fail-fast: false
@@ -1228,48 +1238,21 @@ jobs:
12281238
- { os: macos-latest , features: feat_os_macos }
12291239
- { os: windows-latest , features: feat_os_windows }
12301240
steps:
1231-
- uses: actions/checkout@v6
1232-
with:
1233-
persist-credentials: false
1234-
- uses: dtolnay/rust-toolchain@stable
1235-
- uses: Swatinem/rust-cache@v2
1236-
- name: build and test all programs individually
1237-
shell: bash
1238-
run: |
1239-
CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
1240-
for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
1241-
do
1242-
echo "Building and testing $f"
1243-
cargo test -p "uu_$f"
1244-
done
1245-
1246-
test_all_features:
1247-
name: Test all features separately
1248-
needs: [ min_version, deps ]
1249-
runs-on: ${{ matrix.job.os }}
1250-
strategy:
1251-
fail-fast: false
1252-
matrix:
1253-
job:
1254-
- { os: ubuntu-latest , features: feat_os_unix }
1255-
- { os: macos-latest , features: feat_os_macos }
1256-
# - { os: windows-latest , features: feat_os_windows } https://github.com/uutils/coreutils/issues/7044
1257-
steps:
12581241
- uses: actions/checkout@v6
12591242
with:
12601243
persist-credentials: false
12611244
- name: Avoid no space left on device
12621245
run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android &
12631246
- uses: dtolnay/rust-toolchain@stable
12641247
- uses: Swatinem/rust-cache@v2
1265-
- name: build and test all features individually
1248+
- name: build and test all programs individually
12661249
shell: bash
12671250
run: |
12681251
CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
12691252
for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
12701253
do
1271-
echo "Running tests with --features=$f and --no-default-features"
1272-
cargo test --features=$f --no-default-features
1254+
echo "Building and testing $f"
1255+
cargo test -p "uu_$f" -p coreutils --features=$f --no-default-features
12731256
done
12741257
12751258
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: 1 addition & 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:

‎.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:
@@ -130,6 +131,7 @@ jobs:
130131
env:
131132
SCCACHE_GHA_ENABLED: "true"
132133
RUSTC_WRAPPER: "sccache"
134+
CARGO_INCREMENTAL: 0
133135
steps:
134136
- uses: actions/checkout@v6
135137
with:
@@ -300,6 +302,7 @@ jobs:
300302
env:
301303
SCCACHE_GHA_ENABLED: "true"
302304
RUSTC_WRAPPER: "sccache"
305+
CARGO_INCREMENTAL: 0
303306
steps:
304307
- uses: actions/checkout@v6
305308
with:
@@ -409,6 +412,7 @@ jobs:
409412
env:
410413
SCCACHE_GHA_ENABLED: "true"
411414
RUSTC_WRAPPER: "sccache"
415+
CARGO_INCREMENTAL: 0
412416
strategy:
413417
fail-fast: false
414418
matrix:
@@ -560,6 +564,7 @@ jobs:
560564
env:
561565
SCCACHE_GHA_ENABLED: "true"
562566
RUSTC_WRAPPER: "sccache"
567+
CARGO_INCREMENTAL: 0
563568
strategy:
564569
fail-fast: false
565570
matrix:
@@ -899,6 +904,7 @@ jobs:
899904
env:
900905
SCCACHE_GHA_ENABLED: "true"
901906
RUSTC_WRAPPER: "sccache"
907+
CARGO_INCREMENTAL: 0
902908
steps:
903909
- uses: actions/checkout@v6
904910
with:
@@ -1130,6 +1136,7 @@ jobs:
11301136
env:
11311137
SCCACHE_GHA_ENABLED: "true"
11321138
RUSTC_WRAPPER: "sccache"
1139+
CARGO_INCREMENTAL: 0
11331140
steps:
11341141
- uses: actions/checkout@v6
11351142
with:
@@ -1251,6 +1258,7 @@ jobs:
12511258
env:
12521259
SCCACHE_GHA_ENABLED: "true"
12531260
RUSTC_WRAPPER: "sccache"
1261+
CARGO_INCREMENTAL: 0
12541262
steps:
12551263
- uses: actions/checkout@v6
12561264
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 }}'

0 commit comments

Comments
 (0)