Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit93e4ad1

Browse files
Merge branch 'main' into main
2 parentsc299f7e +f74ccea commit93e4ad1

File tree

629 files changed

+21751
-9009
lines changed

Some content is hidden

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

629 files changed

+21751
-9009
lines changed

‎.cargo/config.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,10 @@ linker = "x86_64-unknown-redox-gcc"
33

44
[env]
55
PROJECT_NAME_FOR_VERSION_STRING ="uutils coreutils"
6+
# See feat_external_libstdbuf in src/uu/stdbuf/Cargo.toml
7+
LIBSTDBUF_DIR ="/usr/local/libexec/coreutils"
8+
9+
# libstdbuf must be a shared library, so musl libc can't be linked statically
10+
# https://github.com/rust-lang/rust/issues/82193
11+
[build]
12+
rustflags = ["-C","target-feature=-crt-static"]

‎.github/fluent_linter_config.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
ID01:
3+
enabled:true
4+
exclusions:
5+
messages:[]
6+
files:[]
7+
ID02:
8+
enabled:true
9+
min_length:7
10+
VC:
11+
disabled:true
12+
# Disable: # TE01: single quote instead of apostrophe for genitive (foo's)
13+
TE01:
14+
enabled:false
15+
# TE03: single quotes ('foo')
16+
TE03:
17+
enabled:false
18+
# TE04: Double-quoted strings should use Unicode " instead of "foo".
19+
TE04:
20+
enabled:false
21+
# Disable: TE05: 3 dots for ellipsis ("...")
22+
TE05:
23+
enabled:false
24+
# Should be fixed
25+
VC01:
26+
disabled:true
27+
ID03:
28+
enabled:true

‎.github/workflows/CICD.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: CICD
55
# spell-checker:ignore (jargon) SHAs deps dequote softprops subshell toolchain fuzzers dedupe devel profdata
66
# spell-checker:ignore (people) Peltoche rivy dtolnay Anson dawidd
77
# spell-checker:ignore (shell/tools) binutils choco clippy dmake dpkg esac fakeroot fdesc fdescfs gmake grcov halium lcov libclang libfuse libssl limactl mkdir nextest nocross pacman popd printf pushd redoxer rsync rustc rustfmt rustup shopt sccache utmpdump xargs
8-
# spell-checker:ignore (misc) aarch alnum armhf bindir busytest coreutils defconfig DESTDIR gecos getenforce gnueabihf issuecomment maint manpages msys multisize noconfirm nullglob onexitbegin onexitend pell runtest Swatinem tempfile testsuite toybox uutils
8+
# spell-checker:ignore (misc) aarch alnum armhf bindir busytest coreutils defconfig DESTDIR gecos getenforce gnueabihf issuecomment maint manpages msys multisize noconfirmnofeaturesnullglob onexitbegin onexitend pell runtest Swatinem tempfile testsuite toybox uutils
99

1010
env:
1111
PROJECT_NAME:coreutils
@@ -443,14 +443,14 @@ jobs:
443443
--arg multisize "$SIZE_MULTI" \
444444
'{($date): { sha: $sha, size: $size, multisize: $multisize, }}' > size-result.json
445445
-name:Download the previous individual size result
446-
uses:dawidd6/action-download-artifact@v9
446+
uses:dawidd6/action-download-artifact@v11
447447
with:
448448
workflow:CICD.yml
449449
name:individual-size-result
450450
repo:uutils/coreutils
451451
path:dl
452452
-name:Download the previous size result
453-
uses:dawidd6/action-download-artifact@v9
453+
uses:dawidd6/action-download-artifact@v11
454454
with:
455455
workflow:CICD.yml
456456
name:size-result
@@ -526,6 +526,8 @@ jobs:
526526
-{ os: ubuntu-latest , target: x86_64-unknown-redox , features: feat_os_unix_redox , use-cross: redoxer , skip-tests: true }
527527
-{ os: ubuntu-latest , target: wasm32-unknown-unknown , default-features: false, features: uucore/format, skip-tests: true, skip-package: true, skip-publish: true }
528528
-{ os: macos-latest , target: aarch64-apple-darwin , features: feat_os_macos, workspace-tests: true }# M1 CPU
529+
# PR #7964: Mac should still build even if the feature is not enabled
530+
-{ os: macos-latest , target: aarch64-apple-darwin , workspace-tests: true }# M1 CPU
529531
-{ os: macos-13 , target: x86_64-apple-darwin , features: feat_os_macos, workspace-tests: true }
530532
-{ os: windows-latest , target: i686-pc-windows-msvc , features: feat_os_windows }
531533
-{ os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows }
@@ -639,6 +641,8 @@ jobs:
639641
CARGO_CMD_OPTIONS=''
640642
;;
641643
esac
644+
# needed for target "aarch64-apple-darwin". There are two jobs, and the difference between them is whether "features" is set
645+
if [ -z "${{ matrix.job.features }}" ]; then ARTIFACTS_SUFFIX='-nofeatures' ; fi
642646
outputs CARGO_CMD
643647
outputs CARGO_CMD_OPTIONS
644648
outputs ARTIFACTS_SUFFIX
@@ -653,10 +657,6 @@ jobs:
653657
;;
654658
esac
655659
outputs CARGO_TEST_OPTIONS
656-
# ** pass needed environment into `cross` container (iff `cross` not already configured via "Cross.toml")
657-
if [ "${CARGO_CMD}" = 'cross' ] && [ ! -e "Cross.toml" ] ; then
658-
printf "[build.env]\npassthrough = [\"CI\", \"RUST_BACKTRACE\", \"CARGO_TERM_COLOR\"]\n" > Cross.toml
659-
fi
660660
# * executable for `strip`?
661661
STRIP="strip"
662662
case ${{ matrix.job.target }} in

‎.github/workflows/GnuTests.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
working-directory:${{ steps.vars.outputs.path_GNU }}
137137

138138
-name:Retrieve reference artifacts
139-
uses:dawidd6/action-download-artifact@v9
139+
uses:dawidd6/action-download-artifact@v11
140140
# ref: <https://github.com/dawidd6/action-download-artifact>
141141
continue-on-error:true## don't break the build for missing reference artifacts (may be expired or just not generated yet)
142142
with:
@@ -166,6 +166,7 @@ jobs:
166166
sudo locale-gen --keep-existing sv_SE
167167
sudo locale-gen --keep-existing sv_SE.UTF-8
168168
sudo locale-gen --keep-existing en_US
169+
sudo locale-gen --keep-existing en_US.UTF-8
169170
sudo locale-gen --keep-existing ru_RU.KOI8-R
170171
171172
sudo update-locale
@@ -194,7 +195,7 @@ jobs:
194195
195196
-name:Selinux - Build for selinux tests
196197
run:|
197-
lima bash -c "cd ~/work/uutils/ && bash util/build-gnu.sh"
198+
lima bash -c "cd ~/work/uutils/ && bash util/build-gnu.sh --release-build"
198199
lima bash -c "mkdir -p ~/work/gnu/tests-selinux/"
199200
200201
-name:Selinux - Run selinux tests

‎.github/workflows/code-quality.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,3 +216,43 @@ jobs:
216216
shell:bash
217217
run:|
218218
python3 -m unittest util/test_compare_test_results.py
219+
220+
pre_commit:
221+
name:Pre-commit hooks
222+
runs-on:ubuntu-latest
223+
steps:
224+
-name:Checkout repository
225+
uses:actions/checkout@v4
226+
with:
227+
persist-credentials:false
228+
229+
-name:Setup Rust toolchain
230+
uses:dtolnay/rust-toolchain@master
231+
with:
232+
toolchain:stable
233+
components:rustfmt, clippy
234+
235+
-name:Cache Rust dependencies
236+
uses:Swatinem/rust-cache@v2
237+
238+
-name:Setup Python
239+
uses:actions/setup-python@v5
240+
with:
241+
python-version:'3.x'
242+
243+
-name:Install pre-commit
244+
run:pip install pre-commit
245+
246+
-name:Install cspell
247+
run:npm install -g cspell
248+
249+
-name:Cache pre-commit environments
250+
uses:actions/cache@v4
251+
with:
252+
path:~/.cache/pre-commit
253+
key:pre-commit-${{ runner.os }}-${{ hashFiles('.pre-commit-config.yaml') }}
254+
restore-keys:|
255+
pre-commit-${{ runner.os }}-
256+
257+
-name:Run pre-commit
258+
run:pre-commit run

‎.github/workflows/freebsd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
-name:Run sccache-cache
4242
uses:mozilla-actions/sccache-action@v0.0.9
4343
-name:Prepare, build and test
44-
uses:vmactions/freebsd-vm@v1.2.0
44+
uses:vmactions/freebsd-vm@v1.2.1
4545
with:
4646
usesh:true
4747
sync:rsync
@@ -135,7 +135,7 @@ jobs:
135135
-name:Run sccache-cache
136136
uses:mozilla-actions/sccache-action@v0.0.9
137137
-name:Prepare, build and test
138-
uses:vmactions/freebsd-vm@v1.2.0
138+
uses:vmactions/freebsd-vm@v1.2.1
139139
with:
140140
usesh:true
141141
sync:rsync

‎.pre-commit-config.yaml

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,50 @@
1+
# See https://pre-commit.com for more information
2+
# See https://pre-commit.com/hooks.html for more hooks
13
repos:
2-
-repo:local
4+
-repo:https://github.com/pre-commit/pre-commit-hooks
5+
rev:v5.0.0
36
hooks:
4-
-id:rust-linting
7+
-id:check-added-large-files
8+
-id:check-executables-have-shebangs
9+
-id:check-json
10+
-id:check-shebang-scripts-are-executable
11+
exclude:'.+\.rs'# would be triggered by #![some_attribute]
12+
-id:check-symlinks
13+
-id:check-toml
14+
-id:check-yaml
15+
args:[ --allow-multiple-documents ]
16+
-id:destroyed-symlinks
17+
-id:end-of-file-fixer
18+
-id:mixed-line-ending
19+
args:[ --fix=lf ]
20+
-id:trailing-whitespace
21+
22+
-repo:https://github.com/mozilla-l10n/moz-fluent-linter
23+
rev:v0.4.8
24+
hooks:
25+
-id:fluent_linter
26+
files:\.ftl$
27+
args:[--config, .github/fluent_linter_config.yml, src/uu/]
28+
29+
-repo:local
30+
hooks:
31+
-id:rust-linting
532
name:Rust linting
633
description:Run cargo fmt on files included in the commit.
734
entry:cargo +stable fmt --
835
pass_filenames:true
936
types:[file, rust]
1037
language:system
11-
-id:rust-clippy
38+
-id:rust-clippy
1239
name:Rust clippy
1340
description:Run cargo clippy on files included in the commit.
1441
entry:cargo +stable clippy --workspace --all-targets --all-features -- -D warnings
1542
pass_filenames:false
1643
types:[file, rust]
1744
language:system
18-
-id:cspell
45+
-id:cspell
1946
name:Code spell checker (cspell)
20-
description:Run cspell to check for spelling errors.
21-
entry:cspell --no-must-find-files --
47+
description:Run cspell to check for spelling errors (if available).
48+
entry:bash -c 'if command -vcspell>/dev/null 2>&1; then cspell--no-must-find-files -- "$@"; else echo "cspell not found, skipping spell check"; exit 0; fi' --
2249
pass_filenames:true
2350
language:system

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ kibi
6868
kibibytes
6969
libacl
7070
lcase
71+
listxattr
7172
llistxattr
7273
lossily
7374
lstat

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ getrandom
2525
globset
2626
indicatif
2727
itertools
28+
iuse
2829
langid
2930
lscolors
3031
mdbook

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp