Skip to content

Commit 966d2ff

Browse files
authored
Merge branch 'uutils:main' into reduce-cgu
2 parents 166195a + 8a40908 commit 966d2ff

File tree

10 files changed

+219
-205
lines changed

10 files changed

+219
-205
lines changed

.github/workflows/CICD.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -546,12 +546,12 @@ jobs:
546546
previous_multisize=$(cat dl/size-result.json | jq -r '.[] | .multisize')
547547
check 'multicall binary' "$multisize" "$previous_multisize" 'size-result.json'
548548
- name: Upload the individual size result
549-
uses: actions/upload-artifact@v5
549+
uses: actions/upload-artifact@v6
550550
with:
551551
name: individual-size-result
552552
path: individual-size-result.json
553553
- name: Upload the size result
554-
uses: actions/upload-artifact@v5
554+
uses: actions/upload-artifact@v6
555555
with:
556556
name: size-result
557557
path: size-result.json
@@ -820,7 +820,7 @@ jobs:
820820
env:
821821
RUST_BACKTRACE: "1"
822822
- name: Archive executable artifacts
823-
uses: actions/upload-artifact@v5
823+
uses: actions/upload-artifact@v6
824824
with:
825825
name: ${{ env.PROJECT_NAME }}-${{ matrix.job.target }}${{ steps.vars.outputs.ARTIFACTS_SUFFIX }}
826826
path: target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}
@@ -920,17 +920,17 @@ jobs:
920920
HASH=$(sha1sum '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}' | cut --delim=" " -f 1)
921921
echo "HASH=${HASH}" >> $GITHUB_OUTPUT
922922
- name: Reserve SHA1/ID of 'test-summary'
923-
uses: actions/upload-artifact@v5
923+
uses: actions/upload-artifact@v6
924924
with:
925925
name: "${{ steps.summary.outputs.HASH }}"
926926
path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
927927
- name: Reserve test results summary
928-
uses: actions/upload-artifact@v5
928+
uses: actions/upload-artifact@v6
929929
with:
930930
name: busybox-test-summary
931931
path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
932932
- name: Upload json results
933-
uses: actions/upload-artifact@v5
933+
uses: actions/upload-artifact@v6
934934
with:
935935
name: busybox-result.json
936936
path: ${{ steps.vars.outputs.TEST_SUMMARY_FILE }}
@@ -1013,17 +1013,17 @@ jobs:
10131013
HASH=$(sha1sum '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}' | cut --delim=" " -f 1)
10141014
echo "HASH=${HASH}" >> $GITHUB_OUTPUT
10151015
- name: Reserve SHA1/ID of 'test-summary'
1016-
uses: actions/upload-artifact@v5
1016+
uses: actions/upload-artifact@v6
10171017
with:
10181018
name: "${{ steps.summary.outputs.HASH }}"
10191019
path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
10201020
- name: Reserve test results summary
1021-
uses: actions/upload-artifact@v5
1021+
uses: actions/upload-artifact@v6
10221022
with:
10231023
name: toybox-test-summary
10241024
path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
10251025
- name: Upload json results
1026-
uses: actions/upload-artifact@v5
1026+
uses: actions/upload-artifact@v6
10271027
with:
10281028
name: toybox-result.json
10291029
path: ${{ steps.vars.outputs.TEST_SUMMARY_FILE }}

.github/workflows/GnuTests.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -168,17 +168,17 @@ jobs:
168168
169169
### Upload artifacts
170170
- name: Upload full json results
171-
uses: actions/upload-artifact@v5
171+
uses: actions/upload-artifact@v6
172172
with:
173173
name: gnu-full-result
174174
path: ${{ env.TEST_FULL_SUMMARY_FILE }}
175175
- name: Upload root json results
176-
uses: actions/upload-artifact@v5
176+
uses: actions/upload-artifact@v6
177177
with:
178178
name: gnu-root-full-result
179179
path: ${{ env.TEST_ROOT_FULL_SUMMARY_FILE }}
180180
- name: Upload stty json results
181-
uses: actions/upload-artifact@v5
181+
uses: actions/upload-artifact@v6
182182
with:
183183
name: gnu-stty-full-result
184184
path: ${{ env.TEST_STTY_FULL_SUMMARY_FILE }}
@@ -189,7 +189,7 @@ jobs:
189189
# Compress logs before upload (fails otherwise)
190190
gzip gnu/tests/*/*.log
191191
- name: Upload test logs
192-
uses: actions/upload-artifact@v5
192+
uses: actions/upload-artifact@v6
193193
with:
194194
name: test-logs
195195
path: |
@@ -318,12 +318,12 @@ jobs:
318318
# Copy the test directory now
319319
rsync -v -a -e ssh lima-default:~/work/gnu/tests/ ./gnu/tests-selinux/
320320
- name: Upload SELinux json results
321-
uses: actions/upload-artifact@v5
321+
uses: actions/upload-artifact@v6
322322
with:
323323
name: selinux-gnu-full-result
324324
path: ${{ env.TEST_SELINUX_FULL_SUMMARY_FILE }}
325325
- name: Upload SELinux root json results
326-
uses: actions/upload-artifact@v5
326+
uses: actions/upload-artifact@v6
327327
with:
328328
name: selinux-root-gnu-full-result
329329
path: ${{ env.TEST_SELINUX_ROOT_FULL_SUMMARY_FILE }}
@@ -333,7 +333,7 @@ jobs:
333333
# Compress logs before upload (fails otherwise)
334334
gzip gnu/tests-selinux/*/*.log
335335
- name: Upload SELinux test logs
336-
uses: actions/upload-artifact@v5
336+
uses: actions/upload-artifact@v6
337337
with:
338338
name: selinux-test-logs
339339
path: |
@@ -376,32 +376,32 @@ jobs:
376376
workflow_conclusion: completed ## continually recalibrates to last commit of default branch with a successful GnuTests (ie, "self-heals" from GnuTest regressions, but needs more supervision for/of regressions)
377377
path: "reference"
378378
- name: Download full json results
379-
uses: actions/download-artifact@v6
379+
uses: actions/download-artifact@v7
380380
with:
381381
name: gnu-full-result
382382
path: results
383383
merge-multiple: true
384384
- name: Download root json results
385-
uses: actions/download-artifact@v6
385+
uses: actions/download-artifact@v7
386386
with:
387387
name: gnu-root-full-result
388388
path: results
389389
merge-multiple: true
390390
- name: Download stty json results
391-
uses: actions/download-artifact@v6
391+
uses: actions/download-artifact@v7
392392
with:
393393
name: gnu-stty-full-result
394394
path: results
395395
merge-multiple: true
396396

397397
- name: Download selinux json results
398-
uses: actions/download-artifact@v6
398+
uses: actions/download-artifact@v7
399399
with:
400400
name: selinux-gnu-full-result
401401
path: results
402402
merge-multiple: true
403403
- name: Download selinux root json results
404-
uses: actions/download-artifact@v6
404+
uses: actions/download-artifact@v7
405405
with:
406406
name: selinux-root-gnu-full-result
407407
path: results
@@ -450,17 +450,17 @@ jobs:
450450
HASH=$(sha1sum '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}' | cut --delim=" " -f 1)
451451
outputs HASH
452452
- name: Upload SHA1/ID of 'test-summary'
453-
uses: actions/upload-artifact@v5
453+
uses: actions/upload-artifact@v6
454454
with:
455455
name: "${{ steps.summary.outputs.HASH }}"
456456
path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
457457
- name: Upload test results summary
458-
uses: actions/upload-artifact@v5
458+
uses: actions/upload-artifact@v6
459459
with:
460460
name: test-summary
461461
path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
462462
- name: Upload aggregated json results
463-
uses: actions/upload-artifact@v5
463+
uses: actions/upload-artifact@v6
464464
with:
465465
name: aggregated-result
466466
path: ${{ steps.vars.outputs.AGGREGATED_SUMMARY_FILE }}
@@ -512,7 +512,7 @@ jobs:
512512
fi
513513
- name: Upload comparison log (for GnuComment workflow)
514514
if: success() || failure() # run regardless of prior step success/failure
515-
uses: actions/upload-artifact@v5
515+
uses: actions/upload-artifact@v6
516516
with:
517517
name: comment
518518
path: reference/comment/

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ jobs:
190190
key: ${{ matrix.arch }}_${{ matrix.target}}_${{ steps.read_rustc_hash.outputs.content }}_${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}_v3
191191
- name: archive any output (error screenshots)
192192
if: always()
193-
uses: actions/upload-artifact@v5
193+
uses: actions/upload-artifact@v6
194194
with:
195195
name: test_output_${{ env.AVD_CACHE_KEY }}
196196
path: output

.github/workflows/fuzzing.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198
path: |
199199
fuzz/corpus/${{ matrix.test-target.name }}
200200
- name: Upload Stats
201-
uses: actions/upload-artifact@v5
201+
uses: actions/upload-artifact@v6
202202
with:
203203
name: fuzz-stats-${{ matrix.test-target.name }}
204204
path: |
@@ -215,7 +215,7 @@ jobs:
215215
with:
216216
persist-credentials: false
217217
- name: Download all stats
218-
uses: actions/download-artifact@v6
218+
uses: actions/download-artifact@v7
219219
with:
220220
path: fuzz/stats-artifacts
221221
pattern: fuzz-stats-*
@@ -309,7 +309,7 @@ jobs:
309309
run: |
310310
cat fuzzing_summary.md
311311
- name: Upload Summary
312-
uses: actions/upload-artifact@v5
312+
uses: actions/upload-artifact@v6
313313
with:
314314
name: fuzzing-summary
315315
path: fuzzing_summary.md

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ PCLMUL
198198
pclmul
199199
PCLMULQDQ
200200
pclmulqdq
201+
PMULL
202+
pmull
201203
TUNABLES
202204
tunables
203205
VMULL

Cargo.lock

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

src/uu/cksum/src/cksum.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ use uucore::checksum::{
2020
sanitize_sha2_sha3_length_str,
2121
};
2222
use uucore::error::UResult;
23-
use uucore::hardware::CpuFeatures;
23+
use uucore::hardware::{HasHardwareFeatures as _, SimdPolicy};
2424
use uucore::line_ending::LineEnding;
2525
use uucore::{format_usage, translate};
2626

2727
/// Print CPU hardware capability detection information to stderr
2828
/// This matches GNU cksum's --debug behavior
2929
fn print_cpu_debug_info() {
30-
let features = CpuFeatures::detect();
30+
let features = SimdPolicy::detect();
3131

3232
fn print_feature(name: &str, available: bool) {
3333
if available {

0 commit comments

Comments
 (0)