Skip to content

Commit 1c13a2d

Browse files
authored
Merge branch 'uutils:main' into main
2 parents 1bb5111 + a75b8a0 commit 1c13a2d

File tree

32 files changed

+768
-107
lines changed

32 files changed

+768
-107
lines changed

.github/workflows/CICD.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -541,9 +541,6 @@ jobs:
541541
PKG_BASENAME=${PROJECT_NAME}-${REF_TAG:-$REF_SHAS}-${{ matrix.job.target }}
542542
PKG_NAME=${PKG_BASENAME}${PKG_suffix}
543543
outputs PKG_suffix PKG_BASENAME PKG_NAME
544-
# deployable tag? (ie, leading "vM" or "M"; M == version number)
545-
unset DEPLOY ; if [[ $REF_TAG =~ ^[vV]?[0-9].* ]]; then DEPLOY='true' ; fi
546-
outputs DEPLOY
547544
# DPKG architecture?
548545
unset DPKG_ARCH
549546
case ${{ matrix.job.target }} in
@@ -749,7 +746,7 @@ jobs:
749746
fi
750747
- name: Publish
751748
uses: softprops/action-gh-release@v2
752-
if: steps.vars.outputs.DEPLOY
749+
if: startsWith(github.ref, 'refs/tags/')
753750
with:
754751
files: |
755752
${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}

.github/workflows/code-quality.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
command: |
127127
## `cargo clippy` lint testing
128128
unset fault
129-
CLIPPY_FLAGS="-W clippy::default_trait_access -W clippy::manual_string_new -W clippy::cognitive_complexity -W clippy::implicit_clone -W clippy::range-plus-one -W clippy::redundant-clone"
129+
CLIPPY_FLAGS="-W clippy::default_trait_access -W clippy::manual_string_new -W clippy::cognitive_complexity -W clippy::implicit_clone -W clippy::range-plus-one -W clippy::redundant-clone -W clippy::match_bool"
130130
fault_type="${{ steps.vars.outputs.FAULT_TYPE }}"
131131
fault_prefix=$(echo "$fault_type" | tr '[:lower:]' '[:upper:]')
132132
# * convert any warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>

.github/workflows/freebsd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Run sccache-cache
4040
uses: mozilla-actions/[email protected]
4141
- name: Prepare, build and test
42-
uses: vmactions/[email protected].6
42+
uses: vmactions/[email protected].7
4343
with:
4444
usesh: true
4545
sync: rsync
@@ -131,7 +131,7 @@ jobs:
131131
- name: Run sccache-cache
132132
uses: mozilla-actions/[email protected]
133133
- name: Prepare, build and test
134-
uses: vmactions/[email protected].6
134+
uses: vmactions/[email protected].7
135135
with:
136136
usesh: true
137137
sync: rsync

.github/workflows/fuzzing.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ jobs:
5353
- { name: fuzz_wc, should_pass: false }
5454
- { name: fuzz_cut, should_pass: false }
5555
- { name: fuzz_split, should_pass: false }
56+
- { name: fuzz_tr, should_pass: false }
57+
- { name: fuzz_env, should_pass: false }
5658
- { name: fuzz_parse_glob, should_pass: true }
5759
- { name: fuzz_parse_size, should_pass: true }
5860
- { name: fuzz_parse_time, should_pass: true }

Cargo.lock

Lines changed: 23 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ fundu = "2.0.0"
285285
gcd = "2.3"
286286
glob = "0.3.1"
287287
half = "2.4"
288-
hostname = "0.3"
288+
hostname = "0.4"
289289
indicatif = "0.17"
290290
itertools = "0.12.1"
291291
libc = "0.2.153"

GNUmakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ UNIX_PROGS := \
147147
nohup \
148148
pathchk \
149149
pinky \
150+
sleep \
150151
stat \
151152
stdbuf \
152153
timeout \
@@ -221,6 +222,7 @@ TEST_PROGS := \
221222
rmdir \
222223
runcon \
223224
seq \
225+
sleep \
224226
sort \
225227
split \
226228
stat \

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ that scripts can be easily transferred between platforms.
5353
## Documentation
5454
uutils has both user and developer documentation available:
5555

56-
- [User Manual](https://uutils.github.io/coreutils/book/)
56+
- [User Manual](https://uutils.github.io/coreutils/docs/)
5757
- [Developer Documentation](https://docs.rs/crate/coreutils/)
5858

5959
Both can also be generated locally, the instructions for that can be found in
@@ -302,7 +302,7 @@ make PREFIX=/my/path uninstall
302302

303303
Below is the evolution of how many GNU tests uutils passes. A more detailed
304304
breakdown of the GNU test results of the main branch can be found
305-
[in the user manual](https://uutils.github.io/coreutils/book/test_coverage.html).
305+
[in the user manual](https://uutils.github.io/coreutils/docs/test_coverage.html).
306306

307307
See <https://github.com/orgs/uutils/projects/1> for the main meta bugs
308308
(many are missing).

fuzz/Cargo.toml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ uu_sort = { path = "../src/uu/sort/" }
2525
uu_wc = { path = "../src/uu/wc/" }
2626
uu_cut = { path = "../src/uu/cut/" }
2727
uu_split = { path = "../src/uu/split/" }
28+
uu_tr = { path = "../src/uu/tr/" }
29+
uu_env = { path = "../src/uu/env/" }
2830

2931
# Prevent this from interfering with workspaces
3032
[workspace]
@@ -107,3 +109,15 @@ name = "fuzz_parse_time"
107109
path = "fuzz_targets/fuzz_parse_time.rs"
108110
test = false
109111
doc = false
112+
113+
[[bin]]
114+
name = "fuzz_tr"
115+
path = "fuzz_targets/fuzz_tr.rs"
116+
test = false
117+
doc = false
118+
119+
[[bin]]
120+
name = "fuzz_env"
121+
path = "fuzz_targets/fuzz_env.rs"
122+
test = false
123+
doc = false

fuzz/fuzz_targets/fuzz_common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ pub fn generate_random_string(max_length: usize) -> String {
374374
let invalid_utf8 = [0xC3, 0x28]; // Invalid UTF-8 sequence
375375
let mut result = String::new();
376376

377-
for _ in 0..rng.gen_range(1..=max_length) {
377+
for _ in 0..rng.gen_range(0..=max_length) {
378378
if rng.gen_bool(0.9) {
379379
let ch = valid_utf8.choose(&mut rng).unwrap();
380380
result.push(*ch);

0 commit comments

Comments
 (0)