Skip to content

Commit b4a93d9

Browse files
mattsu2020mattsu2020
authored
Merge branch 'main' into tail_f_fix
2 parents 3da5598 + 6cf5b06 commit b4a93d9

88 files changed

Lines changed: 2012 additions & 650 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: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,11 @@ jobs:
303303
run: make nextest CARGOFLAGS="--profile ci --hide-progress-bar"
304304
env:
305305
RUST_BACKTRACE: "1"
306-
- name: "`make install COMPLETIONS=n MANPAGES=n`"
306+
- name: "`make install COMPLETIONS=n MANPAGES=n LOCALES=n`"
307307
shell: bash
308308
run: |
309309
set -x
310-
DESTDIR=/tmp/ make PROFILE=release COMPLETIONS=n MANPAGES=n install
310+
DESTDIR=/tmp/ make PROFILE=release COMPLETIONS=n MANPAGES=n LOCALES=n install
311311
# Check that the utils are present
312312
test -f /tmp/usr/local/bin/tty
313313
# Check that the manpage is not present
@@ -355,20 +355,12 @@ jobs:
355355
test -f /tmp/usr/local/bin/hashsum
356356
# Check that hashsum symlinks are present
357357
test -h /tmp/usr/local/bin/b2sum
358-
test -h /tmp/usr/local/bin/b3sum
359358
test -h /tmp/usr/local/bin/md5sum
360359
test -h /tmp/usr/local/bin/sha1sum
361360
test -h /tmp/usr/local/bin/sha224sum
362361
test -h /tmp/usr/local/bin/sha256sum
363-
test -h /tmp/usr/local/bin/sha3-224sum
364-
test -h /tmp/usr/local/bin/sha3-256sum
365-
test -h /tmp/usr/local/bin/sha3-384sum
366-
test -h /tmp/usr/local/bin/sha3-512sum
367362
test -h /tmp/usr/local/bin/sha384sum
368-
test -h /tmp/usr/local/bin/sha3sum
369363
test -h /tmp/usr/local/bin/sha512sum
370-
test -h /tmp/usr/local/bin/shake128sum
371-
test -h /tmp/usr/local/bin/shake256sum
372364
- name: "`make install MULTICALL=y LN=ln -svf`"
373365
shell: bash
374366
run: |
@@ -590,7 +582,8 @@ jobs:
590582
- { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
591583
- { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,uudoc" , use-cross: no, workspace-tests: true }
592584
- { os: ubuntu-latest , target: x86_64-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross }
593-
- { os: ubuntu-latest , target: x86_64-unknown-redox , features: feat_os_unix_redox , use-cross: redoxer , skip-tests: true }
585+
# broken by network error
586+
# - { os: ubuntu-latest , target: x86_64-unknown-redox , features: feat_os_unix_redox , use-cross: redoxer , skip-tests: true }
594587
- { os: ubuntu-latest , target: wasm32-unknown-unknown , default-features: false, features: uucore/format, skip-tests: true, skip-package: true, skip-publish: true }
595588
- { os: macos-latest , target: aarch64-apple-darwin , features: feat_os_macos, workspace-tests: true } # M1 CPU
596589
# PR #7964: Mac should still build even if the feature is not enabled
@@ -1268,7 +1261,7 @@ jobs:
12681261
path: ~/.cache/lima
12691262
key: lima-${{ steps.lima-actions-setup.outputs.version }}
12701263
- name: Start Fedora VM with SELinux
1271-
run: limactl start --plain --name=default --cpus=4 --disk=30 --memory=4 --network=lima:user-v2 template://fedora
1264+
run: limactl start --plain --name=default --cpus=4 --disk=30 --memory=4 --network=lima:user-v2 template:fedora
12721265
- run: rsync -v -a -e ssh . lima-default:~/work/
12731266
- name: Setup Rust and other build deps in VM
12741267
run: |

‎.github/workflows/GnuTests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ jobs:
197197
path: ~/.cache/lima
198198
key: lima-${{ steps.lima-actions-setup.outputs.version }}
199199
- name: Start Fedora VM with SELinux
200-
run: limactl start --plain --name=default --cpus=4 --disk=40 --memory=8 --network=lima:user-v2 template://fedora
200+
run: limactl start --plain --name=default --cpus=4 --disk=40 --memory=8 --network=lima:user-v2 template:fedora
201201
- name: Verify SELinux Status and Configuration
202202
run: |
203203
lima getenforce

‎.github/workflows/android.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
~/.android/avd/*/*.lock
117117
- name: Create and cache emulator image
118118
if: steps.avd-cache.outputs.cache-hit != 'true'
119-
uses: reactivecircus/android-emulator-runner@v2.34.0
119+
uses: reactivecircus/android-emulator-runner@v2.35.0
120120
with:
121121
api-level: ${{ matrix.api-level }}
122122
target: ${{ matrix.target }}
@@ -161,7 +161,7 @@ jobs:
161161
free -mh
162162
df -Th
163163
- name: Build and Test
164-
uses: reactivecircus/android-emulator-runner@v2.34.0
164+
uses: reactivecircus/android-emulator-runner@v2.35.0
165165
with:
166166
api-level: ${{ matrix.api-level }}
167167
target: ${{ matrix.target }}

‎.github/workflows/benchmarks.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
- { package: uu_unexpand }
4444
- { package: uu_uniq }
4545
- { package: uu_wc }
46+
- { package: uu_factor }
4647
steps:
4748
- uses: actions/checkout@v5
4849
with:

‎.github/workflows/code-quality.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
else
134134
extra="--features ${{ matrix.job.features }}"
135135
fi
136-
case '${{ matrix.job.workspace-tests }}' in
136+
case '${{ matrix.job.workspace }}' in
137137
1|t|true|y|yes)
138138
extra="${extra} --workspace"
139139
;;
@@ -186,7 +186,7 @@ jobs:
186186
cfg_files=($(shopt -s nullglob ; echo {.vscode,.}/{,.}c[sS]pell{.json,.config{.js,.cjs,.json,.yaml,.yml},.yaml,.yml} ;))
187187
cfg_file=${cfg_files[0]}
188188
unset CSPELL_CFG_OPTION ; if [ -n "$cfg_file" ]; then CSPELL_CFG_OPTION="--config $cfg_file" ; fi
189-
S=$(cspell ${CSPELL_CFG_OPTION} --no-summary --no-progress .) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n "s/${PWD//\//\\/}\/(.*):(.*):(.*) - (.*)/::${fault_type} file=\1,line=\2,col=\3::${fault_type^^}: \4 (file:'\1', line:\2)/p" ; fault=true ; true ; }
189+
S=$(cspell ${CSPELL_CFG_OPTION} --no-summary --no-progress .) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n "s/^(.*):([0-9]+):([0-9]+) - Unknown word \(([^)]+)\).*$/::${fault_type} file=\1,line=\2,col=\3::${fault_type^^}: \`cspell\`: Unknown word '\4' (file:'\1', line:\2)/p" ; fault=true ; true ; }
190190
if [ -n "${{ steps.vars.outputs.FAIL_ON_FAULT }}" ] && [ -n "$fault" ]; then exit 1 ; fi
191191
192192
toml_format:

‎.github/workflows/freebsd.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ jobs:
4040
- uses: Swatinem/rust-cache@v2
4141
- name: Run sccache-cache
4242
uses: mozilla-actions/sccache-action@v0.0.9
43+
with:
44+
disable_annotations: true
4345
- name: Prepare, build and test
44-
uses: vmactions/freebsd-vm@v1.2.4
46+
uses: vmactions/freebsd-vm@v1.2.6
4547
with:
4648
usesh: true
4749
sync: rsync
@@ -134,8 +136,10 @@ jobs:
134136
- uses: Swatinem/rust-cache@v2
135137
- name: Run sccache-cache
136138
uses: mozilla-actions/sccache-action@v0.0.9
139+
with:
140+
disable_annotations: true
137141
- name: Prepare, build and test
138-
uses: vmactions/freebsd-vm@v1.2.4
142+
uses: vmactions/freebsd-vm@v1.2.6
139143
with:
140144
usesh: true
141145
sync: rsync
@@ -196,7 +200,7 @@ jobs:
196200
if (test -z "\$FAULT"); then cargo nextest run --hide-progress-bar --profile ci --features '${{ matrix.job.features }}' || FAULT=1 ; fi
197201
# There is no systemd-logind on FreeBSD, so test all features except feat_systemd_logind ( https://github.com/rust-lang/cargo/issues/3126#issuecomment-2523441905 )
198202
if (test -z "\$FAULT"); then
199-
UUCORE_FEATURES=\$(cargo metadata --format-version=1 --no-deps -p uucore | jq -r '.packages[] | select(.name == "uucore") | .features | keys | .[]' | grep -v "feat_systemd_logind" | paste -s -d "," -)
203+
UUCORE_FEATURES=\$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "uucore") | .features | keys | .[]' | grep -v "feat_systemd_logind" | paste -s -d "," -)
200204
cargo nextest run --hide-progress-bar --profile ci --features "\$UUCORE_FEATURES" -p uucore || FAULT=1
201205
fi
202206
# Test building with make

0 commit comments

Comments
 (0)