Skip to content

Commit 19da2c7

Browse files
authored
Merge branch 'main' into merge-mac-art
2 parents edd9d9a + 8fc9d28 commit 19da2c7

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/CICD.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,6 +1200,7 @@ jobs:
12001200
- name: build and test all features individually
12011201
shell: bash
12021202
run: |
1203+
command -v sudo && sudo rm -rf /usr/share/dotnet # avoid no space left
12031204
CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
12041205
for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
12051206
do

util/build-gnu.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ else
140140
# Change the PATH to test the uutils coreutils instead of the GNU coreutils
141141
sed -i "s/^[[:blank:]]*PATH=.*/ PATH='${UU_BUILD_DIR//\//\\/}\$(PATH_SEPARATOR)'\"\$\$PATH\" \\\/" tests/local.mk
142142
./bootstrap --skip-po
143-
./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references
143+
./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references \
144+
"$([ ${SELINUX_ENABLED} = 1 ] && echo --with-selinux || echo --without-selinux)"
144145
#Add timeout to to protect against hangs
145146
sed -i 's|^"\$@|'"${SYSTEM_TIMEOUT}"' 600 "\$@|' build-aux/test-driver
146147
sed -i 's| tr | /usr/bin/tr |' tests/init.sh

0 commit comments

Comments
 (0)