Skip to content

Commit 6455557

Browse files
committed
CICD.yml: Merge 2 "spearately"
1 parent d6df52f commit 6455557

File tree

1 file changed

+4
-31
lines changed

1 file changed

+4
-31
lines changed

.github/workflows/CICD.yml

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,7 @@ jobs:
12181218
fail_ci_if_error: false
12191219

12201220
test_separately:
1221-
name: Separate Builds
1221+
name: Separate Builds (individual and coreutils)# duplicated with other CI, but has better appearance
12221222
runs-on: ${{ matrix.job.os }}
12231223
strategy:
12241224
fail-fast: false
@@ -1228,48 +1228,21 @@ jobs:
12281228
- { os: macos-latest , features: feat_os_macos }
12291229
- { os: windows-latest , features: feat_os_windows }
12301230
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:
12581231
- uses: actions/checkout@v6
12591232
with:
12601233
persist-credentials: false
12611234
- name: Avoid no space left on device
12621235
run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android &
12631236
- uses: dtolnay/rust-toolchain@stable
12641237
- uses: Swatinem/rust-cache@v2
1265-
- name: build and test all features individually
1238+
- name: build and test all programs individually
12661239
shell: bash
12671240
run: |
12681241
CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
12691242
for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
12701243
do
1271-
echo "Running tests with --features=$f and --no-default-features"
1272-
cargo test --features=$f --no-default-features
1244+
echo "Building and testing $f"
1245+
cargo test -p "uu_$f" -p coreutils --features=$f --no-default-features
12731246
done
12741247
12751248
test_selinux:

0 commit comments

Comments
 (0)