Skip to content

Commit ec0ecb2

Browse files
oech3oech3
authored
Merge branch 'main' into gnu-cache
2 parents 9ed0d3b + a33c944 commit ec0ecb2

File tree

19 files changed

+684
-271
lines changed

19 files changed

+684
-271
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
@@ -188,17 +188,17 @@ jobs:
188188
189189
### Upload artifacts
190190
- name: Upload full json results
191-
uses: actions/upload-artifact@v5
191+
uses: actions/upload-artifact@v6
192192
with:
193193
name: gnu-full-result
194194
path: ${{ env.TEST_FULL_SUMMARY_FILE }}
195195
- name: Upload root json results
196-
uses: actions/upload-artifact@v5
196+
uses: actions/upload-artifact@v6
197197
with:
198198
name: gnu-root-full-result
199199
path: ${{ env.TEST_ROOT_FULL_SUMMARY_FILE }}
200200
- name: Upload stty json results
201-
uses: actions/upload-artifact@v5
201+
uses: actions/upload-artifact@v6
202202
with:
203203
name: gnu-stty-full-result
204204
path: ${{ env.TEST_STTY_FULL_SUMMARY_FILE }}
@@ -209,7 +209,7 @@ jobs:
209209
# Compress logs before upload (fails otherwise)
210210
gzip gnu/tests/*/*.log
211211
- name: Upload test logs
212-
uses: actions/upload-artifact@v5
212+
uses: actions/upload-artifact@v6
213213
with:
214214
name: test-logs
215215
path: |
@@ -338,12 +338,12 @@ jobs:
338338
# Copy the test directory now
339339
rsync -v -a -e ssh lima-default:~/work/gnu/tests/ ./gnu/tests-selinux/
340340
- name: Upload SELinux json results
341-
uses: actions/upload-artifact@v5
341+
uses: actions/upload-artifact@v6
342342
with:
343343
name: selinux-gnu-full-result
344344
path: ${{ env.TEST_SELINUX_FULL_SUMMARY_FILE }}
345345
- name: Upload SELinux root json results
346-
uses: actions/upload-artifact@v5
346+
uses: actions/upload-artifact@v6
347347
with:
348348
name: selinux-root-gnu-full-result
349349
path: ${{ env.TEST_SELINUX_ROOT_FULL_SUMMARY_FILE }}
@@ -353,7 +353,7 @@ jobs:
353353
# Compress logs before upload (fails otherwise)
354354
gzip gnu/tests-selinux/*/*.log
355355
- name: Upload SELinux test logs
356-
uses: actions/upload-artifact@v5
356+
uses: actions/upload-artifact@v6
357357
with:
358358
name: selinux-test-logs
359359
path: |
@@ -396,32 +396,32 @@ jobs:
396396
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)
397397
path: "reference"
398398
- name: Download full json results
399-
uses: actions/download-artifact@v6
399+
uses: actions/download-artifact@v7
400400
with:
401401
name: gnu-full-result
402402
path: results
403403
merge-multiple: true
404404
- name: Download root json results
405-
uses: actions/download-artifact@v6
405+
uses: actions/download-artifact@v7
406406
with:
407407
name: gnu-root-full-result
408408
path: results
409409
merge-multiple: true
410410
- name: Download stty json results
411-
uses: actions/download-artifact@v6
411+
uses: actions/download-artifact@v7
412412
with:
413413
name: gnu-stty-full-result
414414
path: results
415415
merge-multiple: true
416416

417417
- name: Download selinux json results
418-
uses: actions/download-artifact@v6
418+
uses: actions/download-artifact@v7
419419
with:
420420
name: selinux-gnu-full-result
421421
path: results
422422
merge-multiple: true
423423
- name: Download selinux root json results
424-
uses: actions/download-artifact@v6
424+
uses: actions/download-artifact@v7
425425
with:
426426
name: selinux-root-gnu-full-result
427427
path: results
@@ -470,17 +470,17 @@ jobs:
470470
HASH=$(sha1sum '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}' | cut --delim=" " -f 1)
471471
outputs HASH
472472
- name: Upload SHA1/ID of 'test-summary'
473-
uses: actions/upload-artifact@v5
473+
uses: actions/upload-artifact@v6
474474
with:
475475
name: "${{ steps.summary.outputs.HASH }}"
476476
path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
477477
- name: Upload test results summary
478-
uses: actions/upload-artifact@v5
478+
uses: actions/upload-artifact@v6
479479
with:
480480
name: test-summary
481481
path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
482482
- name: Upload aggregated json results
483-
uses: actions/upload-artifact@v5
483+
uses: actions/upload-artifact@v6
484484
with:
485485
name: aggregated-result
486486
path: ${{ steps.vars.outputs.AGGREGATED_SUMMARY_FILE }}
@@ -532,7 +532,7 @@ jobs:
532532
fi
533533
- name: Upload comparison log (for GnuComment workflow)
534534
if: success() || failure() # run regardless of prior step success/failure
535-
uses: actions/upload-artifact@v5
535+
uses: actions/upload-artifact@v6
536536
with:
537537
name: comment
538538
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.

0 commit comments

Comments
 (0)