Skip to content

Commit ed2e9eb

Browse files
authored
CICD.yml: Merge 2 "separately" (#10425)
1 parent bf12e9c commit ed2e9eb

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
@@ -1228,7 +1228,7 @@ jobs:
12281228
fail_ci_if_error: false
12291229

12301230
test_separately:
1231-
name: Separate Builds
1231+
name: Separate Builds (individual and coreutils)# duplicated with other CI, but has better appearance
12321232
runs-on: ${{ matrix.job.os }}
12331233
strategy:
12341234
fail-fast: false
@@ -1238,48 +1238,21 @@ jobs:
12381238
- { os: macos-latest , features: feat_os_macos }
12391239
- { os: windows-latest , features: feat_os_windows }
12401240
steps:
1241-
- uses: actions/checkout@v6
1242-
with:
1243-
persist-credentials: false
1244-
- uses: dtolnay/rust-toolchain@stable
1245-
- uses: Swatinem/rust-cache@v2
1246-
- name: build and test all programs individually
1247-
shell: bash
1248-
run: |
1249-
CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
1250-
for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
1251-
do
1252-
echo "Building and testing $f"
1253-
cargo test -p "uu_$f"
1254-
done
1255-
1256-
test_all_features:
1257-
name: Test all features separately
1258-
needs: [ min_version, deps ]
1259-
runs-on: ${{ matrix.job.os }}
1260-
strategy:
1261-
fail-fast: false
1262-
matrix:
1263-
job:
1264-
- { os: ubuntu-latest , features: feat_os_unix }
1265-
- { os: macos-latest , features: feat_os_macos }
1266-
# - { os: windows-latest , features: feat_os_windows } https://github.com/uutils/coreutils/issues/7044
1267-
steps:
12681241
- uses: actions/checkout@v6
12691242
with:
12701243
persist-credentials: false
12711244
- name: Avoid no space left on device
12721245
run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android &
12731246
- uses: dtolnay/rust-toolchain@stable
12741247
- uses: Swatinem/rust-cache@v2
1275-
- name: build and test all features individually
1248+
- name: build and test all programs individually
12761249
shell: bash
12771250
run: |
12781251
CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
12791252
for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
12801253
do
1281-
echo "Running tests with --features=$f and --no-default-features"
1282-
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
12831256
done
12841257
12851258
test_selinux:

0 commit comments

Comments
 (0)