Skip to content

Commit 9f4375e

Browse files
mikee47mikee47
committed
Merge remote-tracking branch 'upstream/v2' into feature/upstream-enum-attr
2 parents 0c35af8 + adad0fb commit 9f4375e

24 files changed

Lines changed: 8614 additions & 473 deletions

‎.github/workflows/release.yml‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
github.event.workflow_run.head_sha == github.sha}}
2121

2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v4
2424
with:
2525
ref: ${{github.event.workflow_run.head_sha}}
2626
# need workflow access since we push branches
@@ -30,26 +30,29 @@ jobs:
3030
fetch-depth: 0
3131

3232
# try to get results from tests
33-
- uses: dawidd6/action-download-artifact@v2
33+
- uses: actions/download-artifact@v4
3434
continue-on-error: true
3535
with:
36-
workflow: ${{github.event.workflow_run.name}}
37-
run_id: ${{github.event.workflow_run.id}}
38-
name: sizes
36+
github-token: ${{secrets.GITHUB_TOKEN}}
37+
run-id: ${{github.event.workflow_run.id}}
38+
pattern: '{sizes,sizes-*}'
39+
merge-multiple: true
3940
path: sizes
40-
- uses: dawidd6/action-download-artifact@v2
41+
- uses: actions/download-artifact@v4
4142
continue-on-error: true
4243
with:
43-
workflow: ${{github.event.workflow_run.name}}
44-
run_id: ${{github.event.workflow_run.id}}
45-
name: cov
44+
github-token: ${{secrets.GITHUB_TOKEN}}
45+
run-id: ${{github.event.workflow_run.id}}
46+
pattern: '{cov,cov-*}'
47+
merge-multiple: true
4648
path: cov
47-
- uses: dawidd6/action-download-artifact@v2
49+
- uses: actions/download-artifact@v4
4850
continue-on-error: true
4951
with:
50-
workflow: ${{github.event.workflow_run.name}}
51-
run_id: ${{github.event.workflow_run.id}}
52-
name: bench
52+
github-token: ${{secrets.GITHUB_TOKEN}}
53+
run-id: ${{github.event.workflow_run.id}}
54+
pattern: '{bench,bench-*}'
55+
merge-multiple: true
5356
path: bench
5457

5558
- name: find-version

‎.github/workflows/status.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ jobs:
1313
status:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: dawidd6/action-download-artifact@v2
16+
- uses: actions/download-artifact@v4
1717
continue-on-error: true
1818
with:
19-
workflow: ${{github.event.workflow_run.name}}
20-
run_id: ${{github.event.workflow_run.id}}
21-
name: status
19+
github-token: ${{secrets.GITHUB_TOKEN}}
20+
run-id: ${{github.event.workflow_run.id}}
21+
pattern: '{status,status-*}'
22+
merge-multiple: true
2223
path: status
2324
- name: update-status
2425
continue-on-error: true
@@ -67,12 +68,13 @@ jobs:
6768

6869
steps:
6970
# generated comment?
70-
- uses: dawidd6/action-download-artifact@v2
71+
- uses: actions/download-artifact@v4
7172
continue-on-error: true
7273
with:
73-
workflow: ${{github.event.workflow_run.name}}
74-
run_id: ${{github.event.workflow_run.id}}
75-
name: comment
74+
github-token: ${{secrets.GITHUB_TOKEN}}
75+
run-id: ${{github.event.workflow_run.id}}
76+
pattern: '{comment,comment-*}'
77+
merge-multiple: true
7678
path: comment
7779
- name: update-comment
7880
continue-on-error: true

‎.github/workflows/test.yml‎

Lines changed: 79 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
arch: [x86_64, thumb, mips, powerpc]
2222

2323
steps:
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v4
2525
- name: install
2626
run: |
2727
# need a few things
@@ -235,9 +235,9 @@ jobs:
235235
236236
# create size statuses
237237
- name: upload-sizes
238-
uses: actions/upload-artifact@v2
238+
uses: actions/upload-artifact@v4
239239
with:
240-
name: sizes
240+
name: sizes-${{matrix.arch}}
241241
path: sizes
242242
- name: status-sizes
243243
run: |
@@ -273,16 +273,16 @@ jobs:
273273
}' | tee status/$(basename $f .csv).json
274274
done
275275
- name: upload-status-sizes
276-
uses: actions/upload-artifact@v2
276+
uses: actions/upload-artifact@v4
277277
with:
278-
name: status
278+
name: status-sizes-${{matrix.arch}}
279279
path: status
280280
retention-days: 1
281281

282282
# create cov statuses
283283
- name: upload-cov
284284
if: ${{matrix.arch == 'x86_64'}}
285-
uses: actions/upload-artifact@v2
285+
uses: actions/upload-artifact@v4
286286
with:
287287
name: cov
288288
path: cov
@@ -317,11 +317,11 @@ jobs:
317317
target_step: env.STEP,
318318
}' | tee status/$(basename $f .csv)-$s.json
319319
done
320-
- name: upload-status-sizes
320+
- name: upload-status-cov
321321
if: ${{matrix.arch == 'x86_64'}}
322-
uses: actions/upload-artifact@v2
322+
uses: actions/upload-artifact@v4
323323
with:
324-
name: status
324+
name: status-cov
325325
path: status
326326
retention-days: 1
327327

@@ -336,7 +336,7 @@ jobs:
336336
pls: [1, 2]
337337

338338
steps:
339-
- uses: actions/checkout@v2
339+
- uses: actions/checkout@v4
340340
- name: install
341341
run: |
342342
# need a few things
@@ -361,7 +361,7 @@ jobs:
361361
test-no-intrinsics:
362362
runs-on: ubuntu-latest
363363
steps:
364-
- uses: actions/checkout@v2
364+
- uses: actions/checkout@v4
365365
- name: install
366366
run: |
367367
# need a few things
@@ -374,11 +374,50 @@ jobs:
374374
run: |
375375
CFLAGS="$CFLAGS -DLFS_NO_INTRINSICS" make test
376376
377+
test-shrink:
378+
runs-on: ubuntu-latest
379+
steps:
380+
- uses: actions/checkout@v4
381+
- name: install
382+
run: |
383+
# need a few things
384+
sudo apt-get update -qq
385+
sudo apt-get install -qq gcc python3 python3-pip
386+
pip3 install toml
387+
gcc --version
388+
python3 --version
389+
- name: test-no-intrinsics
390+
run: |
391+
CFLAGS="$CFLAGS -DLFS_SHRINKNONRELOCATING" make test
392+
393+
# run with all trace options enabled to at least make sure these
394+
# all compile
395+
test-yes-trace:
396+
runs-on: ubuntu-latest
397+
steps:
398+
- uses: actions/checkout@v4
399+
- name: install
400+
run: |
401+
# need a few things
402+
sudo apt-get update -qq
403+
sudo apt-get install -qq gcc python3 python3-pip
404+
pip3 install toml
405+
gcc --version
406+
python3 --version
407+
- name: test-yes-trace
408+
run: |
409+
CFLAGS="$CFLAGS \
410+
-DLFS_YES_TRACE \
411+
-DLFS_RAMBD_YES_TRACE \
412+
-DLFS_FILEBD_YES_TRACE \
413+
-DLFS_RAMBD_YES_TRACE" \
414+
make test
415+
377416
# run LFS_MULTIVERSION tests
378417
test-multiversion:
379418
runs-on: ubuntu-latest
380419
steps:
381-
- uses: actions/checkout@v2
420+
- uses: actions/checkout@v4
382421
- name: install
383422
run: |
384423
# need a few things
@@ -395,7 +434,7 @@ jobs:
395434
test-lfs2_0:
396435
runs-on: ubuntu-latest
397436
steps:
398-
- uses: actions/checkout@v2
437+
- uses: actions/checkout@v4
399438
- name: install
400439
run: |
401440
# need a few things
@@ -414,7 +453,7 @@ jobs:
414453
test-valgrind:
415454
runs-on: ubuntu-latest
416455
steps:
417-
- uses: actions/checkout@v2
456+
- uses: actions/checkout@v4
418457
- name: install
419458
run: |
420459
# need a few things
@@ -431,12 +470,11 @@ jobs:
431470
TESTFLAGS="$TESTFLAGS --valgrind --context=1024 -Gdefault -Pnone" \
432471
make test
433472
434-
# test that compilation is warning free under clang
435-
# run with Clang, mostly to check for Clang-specific warnings
473+
# compile/run with Clang, mostly to check for Clang-specific warnings
436474
test-clang:
437475
runs-on: ubuntu-latest
438476
steps:
439-
- uses: actions/checkout@v2
477+
- uses: actions/checkout@v4
440478
- name: install
441479
run: |
442480
# need a few things
@@ -446,20 +484,16 @@ jobs:
446484
python3 --version
447485
- name: test-clang
448486
run: |
449-
# override CFLAGS since Clang does not support -fcallgraph-info
450-
# and -ftrack-macro-expansions
451-
make \
452-
CC=clang \
453-
CFLAGS="$CFLAGS -MMD -g3 -I. -std=c99 -Wall -Wextra -pedantic" \
454-
test
487+
CC=clang \
488+
make test
455489
456490
# run benchmarks
457491
#
458492
# note there's no real benefit to running these on multiple archs
459493
bench:
460494
runs-on: ubuntu-latest
461495
steps:
462-
- uses: actions/checkout@v2
496+
- uses: actions/checkout@v4
463497
- name: install
464498
run: |
465499
# need a few things
@@ -491,7 +525,7 @@ jobs:
491525
492526
# create bench statuses
493527
- name: upload-bench
494-
uses: actions/upload-artifact@v2
528+
uses: actions/upload-artifact@v4
495529
with:
496530
name: bench
497531
path: bench
@@ -525,20 +559,20 @@ jobs:
525559
}' | tee status/$(basename $f .csv)-$s.json
526560
done
527561
- name: upload-status-bench
528-
uses: actions/upload-artifact@v2
562+
uses: actions/upload-artifact@v4
529563
with:
530-
name: status
564+
name: status-bench
531565
path: status
532566
retention-days: 1
533567

534568
# run compatibility tests using the current master as the previous version
535569
test-compat:
536570
runs-on: ubuntu-latest
537571
steps:
538-
- uses: actions/checkout@v2
572+
- uses: actions/checkout@v4
539573
if: ${{github.event_name == 'pull_request'}}
540574
# checkout the current pr target into lfsp
541-
- uses: actions/checkout@v2
575+
- uses: actions/checkout@v4
542576
if: ${{github.event_name == 'pull_request'}}
543577
with:
544578
ref: ${{github.event.pull_request.base.ref}}
@@ -572,7 +606,7 @@ jobs:
572606
runs-on: ubuntu-latest
573607
if: ${{!endsWith(github.ref, '-prefix')}}
574608
steps:
575-
- uses: actions/checkout@v2
609+
- uses: actions/checkout@v4
576610
- name: install
577611
run: |
578612
# need a few things
@@ -582,7 +616,7 @@ jobs:
582616
gcc --version
583617
python3 --version
584618
fusermount -V
585-
- uses: actions/checkout@v2
619+
- uses: actions/checkout@v4
586620
with:
587621
repository: littlefs-project/littlefs-fuse
588622
ref: v2
@@ -622,7 +656,7 @@ jobs:
622656
runs-on: ubuntu-latest
623657
if: ${{!endsWith(github.ref, '-prefix')}}
624658
steps:
625-
- uses: actions/checkout@v2
659+
- uses: actions/checkout@v4
626660
- name: install
627661
run: |
628662
# need a few things
@@ -632,12 +666,12 @@ jobs:
632666
gcc --version
633667
python3 --version
634668
fusermount -V
635-
- uses: actions/checkout@v2
669+
- uses: actions/checkout@v4
636670
with:
637671
repository: littlefs-project/littlefs-fuse
638672
ref: v2
639673
path: v2
640-
- uses: actions/checkout@v2
674+
- uses: actions/checkout@v4
641675
with:
642676
repository: littlefs-project/littlefs-fuse
643677
ref: v1
@@ -694,7 +728,7 @@ jobs:
694728
runs-on: ubuntu-latest
695729
needs: [test, bench]
696730
steps:
697-
- uses: actions/checkout@v2
731+
- uses: actions/checkout@v4
698732
if: ${{github.event_name == 'pull_request'}}
699733
- name: install
700734
if: ${{github.event_name == 'pull_request'}}
@@ -704,23 +738,26 @@ jobs:
704738
pip3 install toml
705739
gcc --version
706740
python3 --version
707-
- uses: actions/download-artifact@v2
741+
- uses: actions/download-artifact@v4
708742
if: ${{github.event_name == 'pull_request'}}
709743
continue-on-error: true
710744
with:
711-
name: sizes
745+
pattern: '{sizes,sizes-*}'
746+
merge-multiple: true
712747
path: sizes
713-
- uses: actions/download-artifact@v2
748+
- uses: actions/download-artifact@v4
714749
if: ${{github.event_name == 'pull_request'}}
715750
continue-on-error: true
716751
with:
717-
name: cov
752+
pattern: '{cov,cov-*}'
753+
merge-multiple: true
718754
path: cov
719-
- uses: actions/download-artifact@v2
755+
- uses: actions/download-artifact@v4
720756
if: ${{github.event_name == 'pull_request'}}
721757
continue-on-error: true
722758
with:
723-
name: bench
759+
pattern: '{bench,bench-*}'
760+
merge-multiple: true
724761
path: bench
725762

726763
# try to find results from tests
@@ -862,7 +899,7 @@ jobs:
862899
body: $comment,
863900
}' | tee comment/comment.json
864901
- name: upload-comment
865-
uses: actions/upload-artifact@v2
902+
uses: actions/upload-artifact@v4
866903
with:
867904
name: comment
868905
path: comment

0 commit comments

Comments
 (0)