Skip to content

Commit e0c1ad4

Browse files
authored
Merge branch 'main' into who_check_pid
2 parents 9713e98 + 2da2c90 commit e0c1ad4

120 files changed

Lines changed: 2532 additions & 1282 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.cargo/config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
linker = "x86_64-unknown-redox-gcc"
77
[target.aarch64-unknown-linux-gnu]
88
linker = "aarch64-linux-gnu-gcc"
9+
[target.riscv64gc-unknown-linux-musl]
10+
rustflags = ["-C", "target-feature=+crt-static"]
911

1012
[env]
1113
# See feat_external_libstdbuf in src/uu/stdbuf/Cargo.toml

.github/workflows/CICD.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ jobs:
309309
./target/release-fast/true
310310
# Check that the progs have prefix
311311
test -f /tmp/usr/local/bin/uu-tty
312-
test -f /tmp/usr/local/libexec/uu-coreutils/libstdbuf.*
312+
test -f /tmp/usr/local/libexec/uu-coreutils/libstdbuf.*
313313
# Check that the manpage is not present
314314
! test -f /tmp/usr/local/share/man/man1/uu-whoami.1
315315
# Check that the completion is not present
@@ -576,6 +576,7 @@ jobs:
576576
- { os: ubuntu-latest , target: arm-unknown-linux-gnueabihf , features: feat_os_unix_gnueabihf , use-cross: use-cross , skip-tests: true }
577577
- { os: ubuntu-24.04-arm , target: aarch64-unknown-linux-gnu , features: feat_os_unix_gnueabihf }
578578
- { os: ubuntu-latest , target: aarch64-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross , skip-tests: true }
579+
- { os: ubuntu-latest , target: riscv64gc-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross , skip-tests: true }
579580
# - { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: feat_selinux , use-cross: use-cross }
580581
- { os: ubuntu-latest , target: i686-unknown-linux-gnu , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
581582
- { os: ubuntu-latest , target: i686-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross }
@@ -636,6 +637,7 @@ jobs:
636637
unset TARGET_ARCH
637638
case '${{ matrix.job.target }}' in
638639
aarch64-*) TARGET_ARCH=arm64 ;;
640+
riscv64gc-*) TARGET_ARCH=riscv64 ;;
639641
arm-*-*hf) TARGET_ARCH=armhf ;;
640642
i686-*) TARGET_ARCH=i686 ;;
641643
x86_64-*) TARGET_ARCH=x86_64 ;;
@@ -700,6 +702,7 @@ jobs:
700702
STRIP="strip"
701703
case ${{ matrix.job.target }} in
702704
aarch64-*-linux-*) STRIP="aarch64-linux-gnu-strip" ;;
705+
riscv64gc-*-linux-*) STRIP="riscv64-linux-gnu-strip" ;;
703706
arm-*-linux-gnueabihf) STRIP="arm-linux-gnueabihf-strip" ;;
704707
*-pc-windows-msvc) STRIP="" ;;
705708
esac;
@@ -726,6 +729,10 @@ jobs:
726729
sudo apt-get -y update
727730
sudo apt-get -y install gcc-aarch64-linux-gnu
728731
;;
732+
riscv64gc-unknown-linux-*)
733+
sudo apt-get -y update
734+
sudo apt-get -y install gcc-riscv64-linux-gnu
735+
;;
729736
*-redox*)
730737
sudo apt-get -y update
731738
sudo apt-get -y install fuse3 libfuse-dev
@@ -799,6 +806,8 @@ jobs:
799806
if: matrix.job.skip-tests != true
800807
shell: bash
801808
run: |
809+
command -v sudo && sudo rm -rf /usr/local/lib/android /usr/share/dotnet # avoid no space left
810+
df -h ||:
802811
## Test individual utilities
803812
${{ steps.vars.outputs.CARGO_CMD }} ${{ steps.vars.outputs.CARGO_CMD_OPTIONS }} test --target=${{ matrix.job.target }} \
804813
${{ matrix.job.cargo-options }} ${{ steps.dep_vars.outputs.CARGO_UTILITY_LIST_OPTIONS }}

.github/workflows/GnuTests.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: GnuTests
22

33
# spell-checker:ignore (abbrev/names) CodeCov gnulib GnuTests Swatinem
44
# spell-checker:ignore (jargon) submodules devel
5-
# spell-checker:ignore (libs/utils) autopoint chksum dpkg getenforce getlimits gperf lcov libexpect limactl pyinotify setenforce shopt texinfo valgrind libattr libcap taiki-e zstd cpio
5+
# spell-checker:ignore (libs/utils) chksum dpkg getenforce getlimits gperf lcov libexpect limactl pyinotify setenforce shopt valgrind libattr libcap taiki-e zstd cpio
66
# spell-checker:ignore (options) Ccodegen Coverflow Cpanic Zpanic
77
# spell-checker:ignore (people) Dawid Dziurla * dawidd dtolnay
88
# spell-checker:ignore (vars) FILESET SUBDIRS XPASS
@@ -47,7 +47,6 @@ jobs:
4747
- uses: dtolnay/rust-toolchain@master
4848
with:
4949
toolchain: stable
50-
components: rustfmt
5150
- uses: Swatinem/rust-cache@v2
5251
with:
5352
workspaces: "./uutils -> target"
@@ -69,7 +68,7 @@ jobs:
6968
## Install dependencies
7069
sudo apt-get update
7170
## Check that build-gnu.sh works on the non SELinux system by installing libselinux only on lima
72-
sudo apt-get install -y autopoint gperf gdb python3-pyinotify valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev attr quilt
71+
sudo apt-get install -y gperf gdb python3-pyinotify valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev attr quilt
7372
curl http://launchpadlibrarian.net/831710181/automake_1.18.1-3_all.deb > automake-1.18.deb
7473
sudo dpkg -i --force-depends automake-1.18.deb
7574
- name: Add various locales
@@ -105,7 +104,7 @@ jobs:
105104
## Build binaries
106105
cd 'uutils'
107106
env PROFILE=release-small bash util/build-gnu.sh
108-
107+
109108
- name: Save files for faster configure and skipping make
110109
uses: actions/cache/save@v5
111110
if: always() && steps.cache-config-gnu.outputs.cache-hit != 'true'
@@ -211,7 +210,6 @@ jobs:
211210
- uses: dtolnay/rust-toolchain@master
212211
with:
213212
toolchain: stable
214-
components: rustfmt
215213
- uses: Swatinem/rust-cache@v2
216214
with:
217215
workspaces: "./uutils -> target"
@@ -247,8 +245,8 @@ jobs:
247245
- name: Install dependencies in VM
248246
run: |
249247
lima sudo dnf -y update
250-
lima sudo dnf -y install git autoconf autopoint bison texinfo gperf gcc gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel texinfo-tex automake patch quilt
251-
lima rustup-init -y --default-toolchain stable
248+
lima sudo dnf -y install autoconf bison gperf gcc gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel automake patch quilt
249+
lima rustup-init -y --profile=minimal --default-toolchain stable
252250
- name: Copy the sources to VM
253251
run: |
254252
rsync -a -e ssh . lima-default:~/work/
@@ -331,7 +329,6 @@ jobs:
331329
- uses: dtolnay/rust-toolchain@master
332330
with:
333331
toolchain: stable
334-
components: rustfmt
335332
- uses: Swatinem/rust-cache@v2
336333
with:
337334
workspaces: "./uutils -> target"

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
disk-size: ${{ env.EMULATOR_DISK_SIZE }}
167167
cores: ${{ env.EMULATOR_CORES }}
168168
force-avd-creation: false
169-
emulator-options: ${{ env.COMMON_EMULATOR_OPTIONS }} -no-snapshot-save -snapshot ${{ env.AVD_CACHE_KEY }}
169+
emulator-options: ${{ env.COMMON_EMULATOR_OPTIONS }} -no-metrics -no-snapshot-save -snapshot ${{ env.AVD_CACHE_KEY }}
170170
emulator-boot-timeout: ${{ env.EMULATOR_BOOT_TIMEOUT }}
171171
# This is not a usual script. Every line is executed in a separate shell with `sh -c`. If
172172
# one of the lines returns with error the whole script is failed (like running a script with

.github/workflows/benchmarks.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- { package: uu_du }
3232
- { package: uu_expand }
3333
- { package: uu_fold }
34-
- { package: uu_hashsum }
34+
- { package: uu_join }
3535
- { package: uu_ls }
3636
- { package: uu_mv }
3737
- { package: uu_nl }
@@ -46,6 +46,7 @@ jobs:
4646
- { package: uu_uniq }
4747
- { package: uu_wc }
4848
- { package: uu_factor }
49+
- { package: uu_date }
4950
steps:
5051
- uses: actions/checkout@v6
5152
with:
@@ -73,7 +74,7 @@ jobs:
7374
env:
7475
CODSPEED_LOG: debug
7576
with:
76-
mode: instrumentation
77+
mode: simulation
7778
run: |
7879
echo "Running benchmarks for ${{ matrix.benchmark-target.package }}"
7980
cargo codspeed run -p ${{ matrix.benchmark-target.package }} > /dev/null

.github/workflows/openbsd.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
prepare: |
4848
# Clean up disk space before installing packages
4949
df -h
50-
rm -rf /usr/share/doc/* /usr/share/man/* /var/cache/* /tmp/* || true
50+
rm -rf /usr/share/relink/* /usr/X11R6/* /usr/share/doc/* /usr/share/man/* || :
5151
pkg_add curl sudo-- jq coreutils bash rust rust-clippy rust-rustfmt llvm--
5252
# Clean up package cache after installation
5353
pkg_delete -a || true
@@ -115,8 +115,6 @@ jobs:
115115
fi
116116
# Clean to avoid to rsync back the files and free up disk space
117117
cargo clean
118-
# Additional cleanup to free disk space
119-
rm -rf ~/.cargo/registry/cache ~/.cargo/git/db || true
120118
if [ -n "\${FAIL_ON_FAULT}" ] && [ -n "\${FAULT}" ]; then exit 1 ; fi
121119
EOF
122120
@@ -144,10 +142,10 @@ jobs:
144142
prepare: |
145143
# Clean up disk space before installing packages
146144
df -h
147-
rm -rf /usr/share/doc/* /usr/share/man/* /var/cache/* /tmp/* || true
145+
rm -rf /usr/share/relink/* /usr/X11R6/* /usr/share/doc/* /usr/share/man/* || :
148146
pkg_add curl gmake sudo-- jq rust llvm--
149147
# Clean up package cache after installation
150-
pkg_delete -a || true
148+
pkg_delete -a || :
151149
df -h
152150
run: |
153151
## Prepare, build, and test
@@ -197,8 +195,6 @@ jobs:
197195
cd "${WORKSPACE}"
198196
unset FAULT
199197
cargo build || FAULT=1
200-
# Clean build artifacts to save disk space before testing
201-
rm -rf target/debug/build target/debug/incremental || true
202198
export PATH=~/.cargo/bin:${PATH}
203199
export RUST_BACKTRACE=1
204200
export CARGO_TERM_COLOR=always
@@ -216,6 +212,5 @@ jobs:
216212
# Clean to avoid to rsync back the files and free up disk space
217213
cargo clean
218214
# Additional cleanup to free disk space
219-
rm -rf ~/.cargo/registry/cache ~/.cargo/git/db target/debug/deps target/release/deps || true
220215
if (test -n "\$FAULT"); then exit 1 ; fi
221216
EOF

.vscode/cspell.dictionaries/jargon.wordlist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ listxattr
8686
llistxattr
8787
lossily
8888
lstat
89+
makedev
8990
mebi
9091
mebibytes
9192
mergeable

.vscode/cspell.dictionaries/workspace.wordlist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ istrip
379379
litout
380380
opost
381381
parodd
382+
ENOTTY
382383

383384
# translation tests
384385
CLICOLOR

0 commit comments

Comments
 (0)