Skip to content

Commit a5095f5

Browse files
authored
Merge branch 'main' into users
2 parents 7872e59 + d5219fe commit a5095f5

222 files changed

Lines changed: 4690 additions & 1362 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.

.github/workflows/CICD.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: CICD
33
# spell-checker:ignore (abbrev/names) CACHEDIR CICD CodeCOV MacOS MinGW MSVC musl taiki
44
# spell-checker:ignore (env/flags) Awarnings Ccodegen Coverflow Cpanic Dwarnings RUSTDOCFLAGS RUSTFLAGS Zpanic CARGOFLAGS CLEVEL nodocs
55
# spell-checker:ignore (jargon) SHAs deps dequote softprops subshell toolchain fuzzers dedupe devel profdata
6-
# spell-checker:ignore (people) Peltoche rivy dtolnay Anson dawidd
6+
# spell-checker:ignore (people) Peltoche rivy Anson dawidd
77
# spell-checker:ignore (shell/tools) binutils choco clippy dmake esac fakeroot fdesc fdescfs gmake grcov halium lcov libclang libfuse libssl limactl nextest nocross pacman popd printf pushd redoxer rsync rustc rustfmt rustup shopt sccache utmpdump xargs zstd
8-
# spell-checker:ignore (misc) aarch alnum armhf bindir busytest coreutils defconfig DESTDIR gecos getenforce gnueabihf issuecomment maint manpages msys multisize noconfirm nofeatures nullglob onexitbegin onexitend pell runtest Swatinem tempfile testsuite toybox uutils libsystemd codspeed wasip libexecinfo
8+
# spell-checker:ignore (misc) aarch alnum armhf bindir busytest coreutils defconfig DESTDIR gecos getenforce gnueabihf issuecomment maint manpages msys multisize noconfirm nofeatures nullglob onexitbegin onexitend pell runtest tempfile testsuite toybox uutils libsystemd codspeed wasip libexecinfo
99

1010
env:
1111
PROJECT_NAME: coreutils

.github/workflows/FixPR.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: FixPR
22

3-
# spell-checker:ignore Swatinem dtolnay dedupe
3+
# spell-checker:ignore dedupe
44

55
# Trigger automated fixes for PRs being merged (with associated commits)
66

.github/workflows/GnuTests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: GnuTests
22

3-
# spell-checker:ignore (abbrev/names) CodeCov gnulib GnuTests Swatinem
3+
# spell-checker:ignore (abbrev/names) CodeCov gnulib GnuTests
44
# spell-checker:ignore (jargon) submodules devel
55
# spell-checker:ignore (libs/utils) chksum dpkg getenforce gperf lcov libexpect limactl pyinotify setenforce shopt valgrind libattr libcap taiki-e zstd cpio
66
# spell-checker:ignore (options) Ccodegen Coverflow Cpanic Zpanic
7-
# spell-checker:ignore (people) Dawid Dziurla * dawidd dtolnay
7+
# spell-checker:ignore (people) Dawid Dziurla * dawidd
88
# spell-checker:ignore (vars) FILESET SUBDIRS XPASS
99
# spell-checker:ignore userns nodocs
1010

@@ -354,7 +354,7 @@ jobs:
354354
path: 'uutils'
355355
persist-credentials: false
356356
- name: Retrieve reference artifacts
357-
uses: dawidd6/action-download-artifact@v19
357+
uses: dawidd6/action-download-artifact@v20
358358
# ref: <https://github.com/dawidd6/action-download-artifact>
359359
continue-on-error: true ## don't break the build for missing reference artifacts (may be expired or just not generated yet)
360360
with:

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Android
22

3-
# spell-checker:ignore (people) reactivecircus Swatinem dtolnay juliangruber
3+
# spell-checker:ignore (people) reactivecircus juliangruber
44
# spell-checker:ignore (shell/tools) TERMUX nextest udevadm pkill
55
# spell-checker:ignore (misc) swiftshader playstore DATALOSS noaudio
66

.github/workflows/benchmarks.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Benchmarks
22

3-
# spell-checker:ignore (people) dtolnay Swatinem taiki-e
3+
# spell-checker:ignore (people) taiki-e
44
# spell-checker:ignore (misc) codspeed sccache
55

66
on:
@@ -48,6 +48,7 @@ jobs:
4848
uu_shuf,
4949
uu_sort,
5050
uu_split,
51+
uu_timeout,
5152
uu_tsort,
5253
uu_unexpand,
5354
uu_uniq,

.github/workflows/code-quality.yml

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Code Quality
22

3-
# spell-checker:ignore (people) dtolnay juliangruber pell reactivecircus Swatinem taiki-e taplo
3+
# spell-checker:ignore (people) juliangruber pell reactivecircus taiki-e taplo
44
# spell-checker:ignore (misc) TERMUX noaudio pkill swiftshader esac sccache pcoreutils shopt subshell dequote libsystemd
55

66
on:
@@ -74,6 +74,7 @@ jobs:
7474
- { os: ubuntu-latest , features: all , workspace: true }
7575
- { os: macos-latest , features: feat_os_unix }
7676
- { os: windows-latest , features: feat_os_windows }
77+
- { os: ubuntu-latest , features: feat_wasm , target: wasm32-wasip1 }
7778
steps:
7879
- uses: actions/checkout@v6
7980
with:
@@ -82,6 +83,7 @@ jobs:
8283
with:
8384
toolchain: stable
8485
components: clippy
86+
targets: ${{ matrix.job.target || '' }}
8587
- uses: Swatinem/rust-cache@v2
8688
- name: Run sccache-cache
8789
id: sccache-setup
@@ -105,6 +107,7 @@ jobs:
105107
esac;
106108
outputs FAIL_ON_FAULT FAULT_TYPE
107109
- name: Install/setup prerequisites
110+
if: ${{ ! matrix.job.target }}
108111
shell: bash
109112
run: |
110113
## Install/setup prerequisites
@@ -124,31 +127,20 @@ jobs:
124127
shell: bash
125128
command: |
126129
## `cargo clippy` lint testing
127-
unset fault
128-
fault_type="${{ steps.vars.outputs.FAULT_TYPE }}"
129-
fault_prefix=$(echo "$fault_type" | tr '[:lower:]' '[:upper:]')
130-
# * convert any warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>
131-
if [[ "${{ matrix.job.features }}" == "all" ]]; then
132-
extra="--all-features"
133-
else
134-
extra="--features ${{ matrix.job.features }}"
130+
ARGS="--features ${{ matrix.job.features }}"
131+
ARGS="${ARGS} --fault-type ${{ steps.vars.outputs.FAULT_TYPE }}"
132+
if [[ "${{ matrix.job.workspace }}" =~ ^(1|t|true|y|yes)$ ]]; then
133+
ARGS="${ARGS} --workspace"
135134
fi
136-
case '${{ matrix.job.workspace }}' in
137-
1|t|true|y|yes)
138-
extra="${extra} --workspace"
139-
;;
140-
esac
141-
# * determine sub-crate utility list (similar to FreeBSD workflow)
142-
if [[ "${{ matrix.job.features }}" == "all" ]]; then
143-
UTILITY_LIST="$(./util/show-utils.sh --all-features)"
144-
else
145-
UTILITY_LIST="$(./util/show-utils.sh --features ${{ matrix.job.features }})"
135+
if [[ -n "${{ matrix.job.target }}" ]]; then
136+
ARGS="${ARGS} --target ${{ matrix.job.target }}"
146137
fi
147-
CARGO_UTILITY_LIST_OPTIONS="$(for u in ${UTILITY_LIST}; do echo -n "-puu_${u} "; done;)"
148-
S=$(cargo clippy --all-targets $extra --tests --benches -pcoreutils ${CARGO_UTILITY_LIST_OPTIONS} -- -D warnings 2>&1) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n -e '/^error:/{' -e "N; s/^error:[[:space:]]+(.*)\\n[[:space:]]+-->[[:space:]]+(.*):([0-9]+):([0-9]+).*$/::${fault_type} file=\2,line=\3,col=\4::${fault_prefix}: \`cargo clippy\`: \1 (file:'\2', line:\3)/p;" -e '}' ; fault=true ; }
149-
if [ -n "${{ steps.vars.outputs.FAIL_ON_FAULT }}" ] && [ -n "$fault" ]; then exit 1 ; fi
138+
if [[ -n "${{ steps.vars.outputs.FAIL_ON_FAULT }}" ]]; then
139+
ARGS="${ARGS} --fail-on-fault"
140+
fi
141+
python3 util/run-clippy.py ${ARGS}
150142
- name: "cargo clippy on fuzz dir"
151-
if: runner.os != 'Windows'
143+
if: runner.os != 'Windows' && !matrix.job.target
152144
shell: bash
153145
run: |
154146
cd fuzz

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# spell-checker:ignore dtolnay libsystemd libattr libcap gsub
1+
# spell-checker:ignore libsystemd libattr libcap gsub
22

33
name: Check uudoc Documentation Generation
44

.github/workflows/freebsd.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: FreeBSD
22

3-
# spell-checker:ignore sshfs usesh vmactions taiki Swatinem esac fdescfs fdesc nextest copyback logind
3+
# spell-checker:ignore sshfs usesh vmactions taiki esac fdescfs fdesc nextest copyback logind
44

55
env:
66
# * style job configuration
@@ -41,7 +41,7 @@ jobs:
4141
sync: rsync
4242
copyback: false
4343
# We need jq and GNU coreutils to run show-utils.sh and bash to use inline shell string replacement
44-
prepare: pkg install -y curl sudo jq coreutils bash
44+
prepare: pkg install -y curl sudo jq coreutils bash python3
4545
run: |
4646
## Prepare, build, and test
4747
# implementation modelled after ref: <https://github.com/rust-lang/rustup/pull/2783>
@@ -73,7 +73,6 @@ jobs:
7373
FAULT_PREFIX=\$(echo "\${FAULT_TYPE}" | tr '[:lower:]' '[:upper:]')
7474
# * determine sub-crate utility list
7575
UTILITY_LIST="\$(./util/show-utils.sh --features ${{ matrix.job.features }})"
76-
CARGO_UTILITY_LIST_OPTIONS="\$(for u in \${UTILITY_LIST}; do echo -n "-puu_\${u} "; done;)"
7776
## Info
7877
# environment
7978
echo "## environment"
@@ -101,8 +100,9 @@ jobs:
101100
## cargo clippy lint testing
102101
if [ -z "\${FAULT}" ]; then
103102
echo "## cargo clippy lint testing"
104-
# * convert any warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>
105-
S=\$(cargo clippy --all-targets \${CARGO_UTILITY_LIST_OPTIONS} -- -D warnings 2>&1) && printf "%s\n" "\$S" || { printf "%s\n" "\$S" ; printf "%s" "\$S" | sed -E -n -e '/^error:/{' -e "N; s/^error:[[:space:]]+(.*)\\n[[:space:]]+-->[[:space:]]+(.*):([0-9]+):([0-9]+).*\$/::\${FAULT_TYPE} file=\2,line=\3,col=\4::\${FAULT_PREFIX}: \\\`cargo clippy\\\`: \1 (file:'\2', line:\3)/p;" -e '}' ; FAULT=true ; }
103+
CLIPPY_ARGS="--features ${{ matrix.job.features }} --fault-type \${FAULT_TYPE}"
104+
if [ -n "\${FAIL_ON_FAULT}" ]; then CLIPPY_ARGS="\${CLIPPY_ARGS} --fail-on-fault"; fi
105+
python3 util/run-clippy.py \${CLIPPY_ARGS} || FAULT=true
106106
fi
107107
# Clean to avoid to rsync back the files
108108
cargo clean

.github/workflows/fuzzing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Fuzzing
22

3-
# spell-checker:ignore (people) dtolnay Swatinem taiki-e
3+
# spell-checker:ignore (people) taiki-e
44
# spell-checker:ignore (misc) fuzzer
55

66
env:

.github/workflows/ignore-intermittent.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
tests/cut/bounded-memory
22
tests/date/date-locale-hour
33
tests/date/resolution
4+
tests/expand/bounded-memory
45
tests/pr/bounded-memory
56
tests/tail/inotify-dir-recreate
67
tests/tail/overlay-headers

0 commit comments

Comments
 (0)