Skip to content

Commit 9dbb3a0

Browse files
authored
Merge branch 'main' into core-1
2 parents 0d4378d + d72d6f7 commit 9dbb3a0

File tree

34 files changed

+718
-431
lines changed

34 files changed

+718
-431
lines changed

.github/workflows/CICD.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ jobs:
196196
## Confirm MinSRV compatible '*/Cargo.lock'
197197
# * '*/Cargo.lock' is required to be in a format that `cargo` of MinSRV can interpret (eg, v1-format for MinSRV < v1.38)
198198
for dir in "." "fuzz"; do
199-
( cd "$dir" && cargo fetch --locked --quiet ) || { echo "::error file=$dir/Cargo.lock::Incompatible (or out-of-date) '$dir/Cargo.lock' file; update using \`cd '$dir' && cargo +${{ env.RUST_MIN_SRV }} update\`" ; exit 1 ; }
199+
( cd "$dir" && cargo fetch --locked --quiet --target $(rustc --print host-tuple)) || { echo "::error file=$dir/Cargo.lock::Incompatible (or out-of-date) '$dir/Cargo.lock' file; update using \`cd '$dir' && cargo +${{ env.RUST_MIN_SRV }} update\`" ; exit 1 ; }
200200
done
201201
- name: Install/setup prerequisites
202202
shell: bash
@@ -221,7 +221,7 @@ jobs:
221221
# dependencies
222222
echo "## dependency list"
223223
## * using the 'stable' toolchain is necessary to avoid "unexpected '--filter-platform'" errors
224-
RUSTUP_TOOLCHAIN=stable cargo fetch --locked --quiet
224+
RUSTUP_TOOLCHAIN=stable cargo fetch --locked --quiet --target $(rustc --print host-tuple)
225225
RUSTUP_TOOLCHAIN=stable cargo tree --no-dedupe --locked -e=no-dev --prefix=none ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} | grep -vE "$PWD" | sort --unique
226226
- name: Test
227227
run: cargo nextest run --hide-progress-bar --profile ci ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} -p uucore -p coreutils
@@ -259,7 +259,7 @@ jobs:
259259
## `cargo update` testing
260260
# * convert any errors/warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>
261261
for dir in "." "fuzz"; do
262-
( cd "$dir" && cargo fetch --locked --quiet ) || { echo "::error file=$dir/Cargo.lock::'$dir/Cargo.lock' file requires update (use \`cd '$dir' && cargo +${{ env.RUST_MIN_SRV }} update\`)" ; exit 1 ; }
262+
( cd "$dir" && cargo fetch --locked --quiet --target $(rustc --print host-tuple)) || { echo "::error file=$dir/Cargo.lock::'$dir/Cargo.lock' file requires update (use \`cd '$dir' && cargo +${{ env.RUST_MIN_SRV }} update\`)" ; exit 1 ; }
263263
done
264264
265265
build_makefile:
@@ -835,7 +835,7 @@ jobs:
835835
cargo tree -V
836836
# dependencies
837837
echo "## dependency list"
838-
cargo fetch --locked --quiet
838+
cargo fetch --locked --quiet --target $(rustc --print host-tuple)
839839
cargo tree --locked --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} ${{ steps.vars.outputs.CARGO_DEFAULT_FEATURES_OPTION }} --no-dedupe -e=no-dev --prefix=none | grep -vE "$PWD" | sort --unique
840840
- name: Build
841841
shell: bash
@@ -895,13 +895,14 @@ jobs:
895895
run: |
896896
mkdir -p share/{man/man1,bash-completion/completions,fish/vendor_completions.d,zsh/site-functions,elvish/lib}
897897
_uudoc=target/${{ matrix.job.target }}/release/uudoc
898-
for bin in $('target/${{ matrix.job.target }}/release/coreutils' --list);do
898+
for bin in $('target/${{ matrix.job.target }}/release/coreutils' --list) coreutils;do
899899
${_uudoc} manpage ${bin} > share/man/man1/${bin}.1
900900
${_uudoc} completion ${bin} bash > share/bash-completion/completions/${bin}.bash
901901
${_uudoc} completion ${bin} fish > share/fish/vendor_completions.d/${bin}.fish
902902
${_uudoc} completion ${bin} zsh > share/zsh/site-functions/_${bin}
903903
${_uudoc} completion ${bin} elvish > share/elvish/lib/${bin}.elv
904904
done
905+
rm share/zsh/site-functions/_[ # not supported
905906
tar --zstd -cf docs.tar.zst share
906907
- name: Publish
907908
uses: softprops/action-gh-release@v2

.github/workflows/ignore-intermittent.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ tests/tty/tty-eof
88
tests/misc/stdbuf
99
tests/misc/usage_vs_getopt
1010
tests/misc/tee
11+
tests/tail/follow-name

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ inacc
184184
maint
185185
proc
186186
procs
187+
TOCTOU
187188

188189
# * constants
189190
xffff
@@ -202,6 +203,7 @@ nofield
202203
# * clippy
203204
uninlined
204205
nonminimal
206+
rposition
205207

206208
# * CPU/hardware features
207209
ASIMD

0 commit comments

Comments
 (0)