Skip to content

Commit 2c4cf3e

Browse files
authored
Merge branch 'main' into sort_performan-ce
2 parents 099a393 + 1c29075 commit 2c4cf3e

File tree

39 files changed

+418
-284
lines changed

39 files changed

+418
-284
lines changed

.github/workflows/CICD.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,11 +1189,14 @@ jobs:
11891189

11901190
test_separately:
11911191
name: Separate Builds
1192-
runs-on: ${{ matrix.os }}
1192+
runs-on: ${{ matrix.job.os }}
11931193
strategy:
11941194
fail-fast: false
11951195
matrix:
1196-
os: [ubuntu-latest, macos-latest, windows-latest]
1196+
job:
1197+
- { os: ubuntu-latest , features: feat_os_unix }
1198+
- { os: macos-latest , features: feat_os_macos }
1199+
- { os: windows-latest , features: feat_os_windows }
11971200
steps:
11981201
- uses: actions/checkout@v5
11991202
with:
@@ -1203,7 +1206,8 @@ jobs:
12031206
- name: build and test all programs individually
12041207
shell: bash
12051208
run: |
1206-
for f in $(util/show-utils.sh)
1209+
CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
1210+
for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
12071211
do
12081212
echo "Building and testing $f"
12091213
cargo test -p "uu_$f" || exit 1
@@ -1212,12 +1216,14 @@ jobs:
12121216
test_all_features:
12131217
name: Test all features separately
12141218
needs: [ min_version, deps ]
1215-
runs-on: ${{ matrix.os }}
1219+
runs-on: ${{ matrix.job.os }}
12161220
strategy:
12171221
fail-fast: false
12181222
matrix:
1219-
os: [ubuntu-latest, macos-latest]
1220-
# windows-latest - https://github.com/uutils/coreutils/issues/7044
1223+
job:
1224+
- { os: ubuntu-latest , features: feat_os_unix }
1225+
- { os: macos-latest , features: feat_os_macos }
1226+
# - { os: windows-latest , features: feat_os_windows } https://github.com/uutils/coreutils/issues/7044
12211227
steps:
12221228
- uses: actions/checkout@v5
12231229
with:
@@ -1227,7 +1233,8 @@ jobs:
12271233
- name: build and test all features individually
12281234
shell: bash
12291235
run: |
1230-
for f in $(util/show-utils.sh)
1236+
CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
1237+
for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
12311238
do
12321239
echo "Running tests with --features=$f and --no-default-features"
12331240
cargo test --features=$f --no-default-features

.github/workflows/code-quality.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ jobs:
110110
## Install/setup prerequisites
111111
case '${{ matrix.job.os }}' in
112112
ubuntu-*)
113+
sudo apt-get -y update
113114
# selinux and systemd headers needed to enable all features
114115
sudo apt-get -y install libselinux1-dev libsystemd-dev
115116
;;

0 commit comments

Comments
 (0)