Skip to content

Commit 241030e

Browse files
committed
Merge remote-tracking branch 'upstream/main' into date-positional-set-format
2 parents ee67c4a + c90f1ea commit 241030e

112 files changed

Lines changed: 1761 additions & 1381 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/benchmarks.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
benchmarks:
2222
name: Run ${{ matrix.type }} benchmarks for ${{ matrix.package }} (CodSpeed)
2323
runs-on: ubuntu-latest
24+
timeout-minutes: 90
2425
env:
2526
CARGO_INCREMENTAL: 0
2627
strategy:
@@ -35,6 +36,7 @@ jobs:
3536
uu_dd,
3637
uu_df,
3738
uu_du,
39+
uu_echo,
3840
uu_expand,
3941
uu_fold,
4042
uu_hostname,

.github/workflows/ignore-intermittent.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ tests/expand/bounded-memory
66
tests/pr/bounded-memory
77
tests/tail/inotify-dir-recreate
88
tests/tail/overlay-headers
9+
tests/tail/retry
910
tests/tail/tail-n0f
1011
tests/tail/pipe-f
1112
tests/timeout/timeout
@@ -18,3 +19,4 @@ tests/misc/usage_vs_getopt
1819
tests/misc/tee
1920
tests/tail/follow-name
2021
tests/rm/isatty
22+
tests/misc/io-errors

.github/workflows/make.yml

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: make
22

33
# spell-checker:ignore (abbrev/names) CACHEDIR taiki
4-
# spell-checker:ignore (env/flags) RUSTDOCFLAGS RUSTFLAGS CARGOFLAGS CLEVEL
4+
# spell-checker:ignore (env/flags) CHERE RUSTDOCFLAGS RUSTFLAGS CARGOFLAGS CLEVEL
55
# spell-checker:ignore (jargon) deps softprops toolchain
66
# spell-checker:ignore (people) dawidd
7-
# spell-checker:ignore (shell/tools) nextest sccache zstd
8-
# spell-checker:ignore (misc) bindir busytest defconfig DESTDIR manpages multisize runtest testsuite toybox uutils
7+
# spell-checker:ignore (shell/tools) bsdtar nextest pacman sccache zstd
8+
# spell-checker:ignore (misc) bindir busytest defconfig DESTDIR manpages multisize noconfirm runtest testsuite toybox uutils
99

1010
env:
1111
PROJECT_NAME: coreutils
@@ -93,26 +93,6 @@ jobs:
9393
disable_search: true
9494
flags: makefile,${{ matrix.job.os }}
9595
fail_ci_if_error: false
96-
- name: "`make install PROG_PREFIX=uu- PROFILE=release-small COMPLETIONS=n MANPAGES=n LOCALES=n`"
97-
shell: bash
98-
run: |
99-
set -x
100-
DESTDIR=/tmp/ make install PROG_PREFIX=uu- PROFILE=release-small COMPLETIONS=n MANPAGES=n LOCALES=n
101-
# Check that utils are built with given profile
102-
./target/release-small/true
103-
# Check that the progs have prefix
104-
test -f /tmp/usr/local/bin/uu-tty
105-
test -f /tmp/usr/local/libexec/uu-coreutils/libstdbuf.*
106-
# Check that the manpage is not present
107-
! test -f /tmp/usr/local/share/man/man1/uu-whoami.1
108-
# Check that the completion is not present
109-
! test -f /tmp/usr/local/share/zsh/site-functions/_uu-install
110-
! test -f /tmp/usr/local/share/bash-completion/completions/uu-head.bash
111-
! test -f /tmp/usr/local/share/fish/vendor_completions.d/uu-cat.fish
112-
# don't publish binaries with uu-
113-
make uninstall PROG_PREFIX=uu- PROFILE=release-small COMPLETIONS=n MANPAGES=n LOCALES=n
114-
env:
115-
RUST_BACKTRACE: "1"
11696
- name: "`make install`"
11797
shell: bash
11898
run: |
@@ -292,8 +272,10 @@ jobs:
292272
DESTDIR=/tmp/ make SKIP_UTILS="stdbuf" install
293273
294274
# keep this job minimal to avoid have many duplicated build with CICD
295-
build_makefile-other:
296-
name: Build/Makefile
275+
build_makefile-windows-cygwin:
276+
name: Build MSYS
277+
permissions:
278+
contents: write # Publish cygwin binary
297279
runs-on: ${{ matrix.job.os }}
298280
env:
299281
CARGO_INCREMENTAL: 0
@@ -316,6 +298,40 @@ jobs:
316298
run: |
317299
echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
318300
echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
301+
- name: "`(x86_64-pc-cygwin) make install PROG_PREFIX=uu- PROFILE=release-small COMPLETIONS=n MANPAGES=n LOCALES=n`"
302+
shell: 'C:\msys64\usr\bin\bash.exe --login -eo pipefail {0}'
303+
run: |
304+
set -x
305+
pacman -Sy --noconfirm --needed make rust base-devel
306+
DESTDIR=/tmp/c make install PROG_PREFIX=uu- PROFILE=release-small COMPLETIONS=n MANPAGES=n LOCALES=n
307+
# Check that utils are built with given profile
308+
./target/release-small/true
309+
# Check that the progs have prefix
310+
test -f /tmp/c/usr/local/bin/uu-tty
311+
test -f /tmp/c/usr/local/libexec/uu-coreutils/libstdbuf.*
312+
# Check that the manpage is not present
313+
! test -f /tmp/c/usr/local/share/man/man1/uu-whoami.1
314+
# Check that the completion is not present
315+
! test -f /tmp/c/usr/local/share/zsh/site-functions/_uu-install
316+
! test -f /tmp/c/usr/local/share/bash-completion/completions/uu-head.bash
317+
! test -f /tmp/c/usr/local/share/fish/vendor_completions.d/uu-cat.fish
318+
# package
319+
mv target/release-small/deps/stdbuf.dll -t /tmp/c/usr/local/bin
320+
bsdtar -caf x86_64-pc-cygwin.tar.zst -C /tmp/c/usr/local bin
321+
env:
322+
CHERE_INVOKING: 1
323+
RUST_BACKTRACE: "1"
324+
- name: Publish
325+
uses: softprops/action-gh-release@v3
326+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
327+
with:
328+
tag_name: latest-commit
329+
draft: false
330+
prerelease: true
331+
files: |
332+
x86_64-pc-cygwin.tar.zst
333+
env:
334+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
319335
- name: "`make build`"
320336
shell: bash
321337
run: |

.github/workflows/wasi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
CARGO_TARGET_WASM32_WASIP1_RUNNER: wasmtime
3838
run: |
3939
# Get all utilities and exclude ones that don't compile for wasm32-wasip1
40-
EXCLUDE="dd|df|du|env|expr|mktemp|more|tac|test"
40+
EXCLUDE="df|du|env|expr|more|tac|test"
4141
UTILS=$(./util/show-utils.sh | tr ' ' '\n' | grep -vE "^($EXCLUDE)$" | sed 's/^/-p uu_/' | tr '\n' ' ')
4242
cargo test --target wasm32-wasip1 --no-default-features $UTILS
4343
- name: Run integration tests via wasmtime

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,9 +364,11 @@ uutils
364364
execfn
365365
fstatfs
366366
getcwd
367+
mkfifoat
367368
setpipe
368369

369370
# * other
371+
auxv
370372
getlimits
371373
weblate
372374
algs

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"cSpell.import": [
33
"./.vscode/cSpell.json"
4-
]
4+
],
5+
"rust-analyzer.check.command": "clippy"
56
}

0 commit comments

Comments
 (0)