Skip to content

Commit ff59aaa

Browse files
authored
Merge branch 'main' into seq_compatibility
2 parents 02875d0 + 2d718f2 commit ff59aaa

File tree

261 files changed

+9767
-3420
lines changed

Some content is hidden

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

261 files changed

+9767
-3420
lines changed

.busybox-config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@ CONFIG_FEATURE_FANCY_HEAD=y
22
CONFIG_UNICODE_SUPPORT=y
33
CONFIG_DESKTOP=y
44
CONFIG_LONG_OPTS=y
5+
CONFIG_FEATURE_SORT_BIG=y
6+
CONFIG_FEATURE_CATV=y
7+
CONFIG_FEATURE_CATN=y
8+
CONFIG_FEATURE_TR_CLASSES=y
9+
CONFIG_FEATURE_READLINK_FOLLOW=y

.devcontainer/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ RUN apt-get update \
1717
libcap-dev \
1818
libexpect-perl \
1919
libselinux1-dev \
20+
libsystemd-dev \
2021
python3-pyinotify \
2122
quilt \
2223
texinfo \

.github/workflows/CICD.yml

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
shell: bash
150150
run: |
151151
RUSTDOCFLAGS="-Dwarnings" cargo doc ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} --no-deps --workspace --document-private-items
152-
- uses: DavidAnson/markdownlint-cli2-action@v21
152+
- uses: DavidAnson/markdownlint-cli2-action@v22
153153
with:
154154
fix: "true"
155155
globs: |
@@ -300,22 +300,22 @@ jobs:
300300
run: make nextest PROFILE=ci CARGOFLAGS="--hide-progress-bar"
301301
env:
302302
RUST_BACKTRACE: "1"
303-
304-
- name: "`make install PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n`"
303+
- name: "`make install PROG_PREFIX=uu- PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n`"
305304
shell: bash
306305
run: |
307306
set -x
308-
DESTDIR=/tmp/ make PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n install
307+
DESTDIR=/tmp/ make install PROG_PREFIX=uu- PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n
309308
# Check that utils are built with given profile
310309
./target/release-fast/true
311-
# Check that the utils are present
312-
test -f /tmp/usr/local/bin/tty
310+
# Check that the progs have prefix
311+
test -f /tmp/usr/local/bin/uu-tty
312+
test -f /tmp/usr/local/libexec/uu-coreutils/libstdbuf.*
313313
# Check that the manpage is not present
314-
! test -f /tmp/usr/local/share/man/man1/whoami.1
314+
! test -f /tmp/usr/local/share/man/man1/uu-whoami.1
315315
# Check that the completion is not present
316-
! test -f /tmp/usr/local/share/zsh/site-functions/_install
317-
! test -f /tmp/usr/local/share/bash-completion/completions/head.bash
318-
! test -f /tmp/usr/local/share/fish/vendor_completions.d/cat.fish
316+
! test -f /tmp/usr/local/share/zsh/site-functions/_uu-install
317+
! test -f /tmp/usr/local/share/bash-completion/completions/uu-head.bash
318+
! test -f /tmp/usr/local/share/fish/vendor_completions.d/uu-cat.fish
319319
env:
320320
RUST_BACKTRACE: "1"
321321
- name: "`make install`"
@@ -502,14 +502,14 @@ jobs:
502502
--arg multisize "$SIZE_MULTI" \
503503
'{($date): { sha: $sha, size: $size, multisize: $multisize, }}' > size-result.json
504504
- name: Download the previous individual size result
505-
uses: dawidd6/action-download-artifact@v11
505+
uses: dawidd6/action-download-artifact@v12
506506
with:
507507
workflow: CICD.yml
508508
name: individual-size-result
509509
repo: uutils/coreutils
510510
path: dl
511511
- name: Download the previous size result
512-
uses: dawidd6/action-download-artifact@v11
512+
uses: dawidd6/action-download-artifact@v12
513513
with:
514514
workflow: CICD.yml
515515
name: size-result
@@ -546,12 +546,12 @@ jobs:
546546
previous_multisize=$(cat dl/size-result.json | jq -r '.[] | .multisize')
547547
check 'multicall binary' "$multisize" "$previous_multisize" 'size-result.json'
548548
- name: Upload the individual size result
549-
uses: actions/upload-artifact@v5
549+
uses: actions/upload-artifact@v6
550550
with:
551551
name: individual-size-result
552552
path: individual-size-result.json
553553
- name: Upload the size result
554-
uses: actions/upload-artifact@v5
554+
uses: actions/upload-artifact@v6
555555
with:
556556
name: size-result
557557
path: size-result.json
@@ -585,7 +585,7 @@ jobs:
585585
- { os: ubuntu-latest , target: x86_64-unknown-redox , features: feat_os_unix_redox , use-cross: redoxer , skip-tests: true }
586586
- { os: ubuntu-latest , target: wasm32-unknown-unknown , default-features: false, features: uucore/format, skip-tests: true, skip-package: true, skip-publish: true }
587587
- { os: macos-latest , target: aarch64-apple-darwin , features: feat_os_macos, workspace-tests: true } # M1 CPU
588-
# PR #7964: Mac should still build even if the feature is not enabled. Do not publish this.
588+
# PR #7964: Mac should still build even if the feature is not enabled. Do not publish this.
589589
- { os: macos-latest , target: aarch64-apple-darwin , workspace-tests: true, skip-publish: true } # M1 CPU
590590
- { os: macos-latest , target: x86_64-apple-darwin , features: feat_os_macos, workspace-tests: true }
591591
- { os: windows-latest , target: i686-pc-windows-msvc , features: feat_os_windows }
@@ -820,7 +820,7 @@ jobs:
820820
env:
821821
RUST_BACKTRACE: "1"
822822
- name: Archive executable artifacts
823-
uses: actions/upload-artifact@v5
823+
uses: actions/upload-artifact@v6
824824
with:
825825
name: ${{ env.PROJECT_NAME }}-${{ matrix.job.target }}${{ steps.vars.outputs.ARTIFACTS_SUFFIX }}
826826
path: target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}
@@ -920,17 +920,17 @@ jobs:
920920
HASH=$(sha1sum '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}' | cut --delim=" " -f 1)
921921
echo "HASH=${HASH}" >> $GITHUB_OUTPUT
922922
- name: Reserve SHA1/ID of 'test-summary'
923-
uses: actions/upload-artifact@v5
923+
uses: actions/upload-artifact@v6
924924
with:
925925
name: "${{ steps.summary.outputs.HASH }}"
926926
path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
927927
- name: Reserve test results summary
928-
uses: actions/upload-artifact@v5
928+
uses: actions/upload-artifact@v6
929929
with:
930930
name: busybox-test-summary
931931
path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
932932
- name: Upload json results
933-
uses: actions/upload-artifact@v5
933+
uses: actions/upload-artifact@v6
934934
with:
935935
name: busybox-result.json
936936
path: ${{ steps.vars.outputs.TEST_SUMMARY_FILE }}
@@ -1013,17 +1013,17 @@ jobs:
10131013
HASH=$(sha1sum '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}' | cut --delim=" " -f 1)
10141014
echo "HASH=${HASH}" >> $GITHUB_OUTPUT
10151015
- name: Reserve SHA1/ID of 'test-summary'
1016-
uses: actions/upload-artifact@v5
1016+
uses: actions/upload-artifact@v6
10171017
with:
10181018
name: "${{ steps.summary.outputs.HASH }}"
10191019
path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
10201020
- name: Reserve test results summary
1021-
uses: actions/upload-artifact@v5
1021+
uses: actions/upload-artifact@v6
10221022
with:
10231023
name: toybox-test-summary
10241024
path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
10251025
- name: Upload json results
1026-
uses: actions/upload-artifact@v5
1026+
uses: actions/upload-artifact@v6
10271027
with:
10281028
name: toybox-result.json
10291029
path: ${{ steps.vars.outputs.TEST_SUMMARY_FILE }}
@@ -1099,7 +1099,9 @@ jobs:
10991099
11001100
case '${{ matrix.job.os }}' in
11011101
ubuntu-latest)
1102-
sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev
1102+
# selinux and systemd headers needed to build tests
1103+
sudo apt-get -y update
1104+
sudo apt-get -y install libselinux1-dev libsystemd-dev
11031105
# pinky is a tool to show logged-in users from utmp, and gecos fields from /etc/passwd.
11041106
# In GitHub Action *nix VMs, no accounts log in, even the "runner" account that runs the commands, and "system boot" entry is missing.
11051107
# The account also has empty gecos fields.
@@ -1213,7 +1215,7 @@ jobs:
12131215
uses: lima-vm/lima-actions/setup@v1
12141216
id: lima-actions-setup
12151217
- name: Cache ~/.cache/lima
1216-
uses: actions/cache@v4
1218+
uses: actions/cache@v5
12171219
with:
12181220
path: ~/.cache/lima
12191221
key: lima-${{ steps.lima-actions-setup.outputs.version }}

0 commit comments

Comments
 (0)