Skip to content

Commit 74ab9a7

Browse files
katefkatef
committed
Merge branch 'kate/actions-fluffery' into kate/interpolate_groups
2 parents 0d487a6 + 661105e commit 74ab9a7

File tree

1 file changed

+53
-35
lines changed

1 file changed

+53
-35
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 53 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Cache checkout
22-
uses: actions/cache@v4
22+
uses: actions/cache@v5
2323
id: cache-checkout
2424
with:
2525
path: ${{ env.wc }}
@@ -52,7 +52,7 @@ jobs:
5252

5353
steps:
5454
- name: Cache PCRE suite
55-
uses: actions/cache@v4
55+
uses: actions/cache@v5
5656
id: cache-pcre
5757
with:
5858
path: pcre-suite/${{ env.pcre2 }}
@@ -70,19 +70,20 @@ jobs:
7070
chmod -R ug-w pcre-suite
7171
7272
- name: Cache converted PCRE tests
73-
uses: actions/cache@v4
73+
uses: actions/cache@v5
7474
id: cache-cvtpcre
7575
with:
7676
path: ${{ env.cvtpcre }}
7777
key: cvtpcre-bmake-${{ matrix.os }}-gcc-DEBUG-AUSAN-${{ github.sha }}-${{ env.pcre2 }}
7878

79-
- name: Fetch build
79+
- name: Restore build
8080
if: steps.cache-cvtpcre.outputs.cache-hit != 'true'
81-
uses: actions/cache@v4
81+
uses: actions/cache/restore@v5
8282
id: cache-build
8383
with:
8484
path: ${{ env.build }}
8585
key: build-bmake-${{ matrix.os }}-gcc-DEBUG-AUSAN-${{ github.sha }} # arbitrary build, just for cvtpcre
86+
fail-on-cache-miss: true
8687

8788
- name: Convert PCRE suite
8889
if: steps.cache-cvtpcre.outputs.cache-hit != 'true'
@@ -157,15 +158,16 @@ jobs:
157158
cc: gcc # -fsanitize=fuzzer is clang-only
158159

159160
steps:
160-
- name: Fetch checkout
161-
uses: actions/cache@v4
161+
- name: Restore checkout
162+
uses: actions/cache/restore@v5
162163
id: cache-checkout
163164
with:
164165
path: ${{ env.wc }}
165166
key: checkout-${{ github.sha }}
167+
fail-on-cache-miss: true
166168

167169
- name: Cache build
168-
uses: actions/cache@v4
170+
uses: actions/cache@v5
169171
id: cache-build
170172
with:
171173
path: ${{ env.build }}
@@ -235,20 +237,26 @@ jobs:
235237
make: pmake # not packaged
236238

237239
steps:
238-
- name: Fetch checkout
239-
uses: actions/cache@v4
240+
- name: Restore checkout
241+
uses: actions/cache/restore@v5
240242
id: cache-checkout
241243
with:
242244
path: ${{ env.wc }}
243245
key: checkout-${{ github.sha }}
246+
fail-on-cache-miss: true
244247

245248
# An arbitary build.
246-
- name: Fetch build
247-
uses: actions/cache@v4
249+
# Failing to fetch this is not fatal, we're testing Makefiles here.
250+
# Some combinations of our options (pmake, EXPENSIVE_CHECKS, whatever)
251+
# won't exist in cache because we didn't build those. That's okay for
252+
# the purposes of this step, building those is harmless.
253+
- name: Restore build
254+
uses: actions/cache/restore@v5
248255
id: cache-build
249256
with:
250257
path: ${{ env.build }}
251258
key: build-${{ matrix.make }}-${{ matrix.os }}-${{ matrix.cc }}-${{ matrix.debug }}-${{ matrix.san }}-${{ github.sha }}
259+
fail-on-cache-miss: false
252260

253261
# We don't need to build the entire repo to know that the makefiles work,
254262
# I'm just deleting a couple of .o files and rebuilding those instead.
@@ -324,12 +332,13 @@ jobs:
324332
san: MSAN # not supported
325333

326334
steps:
327-
- name: Fetch checkout
328-
uses: actions/cache@v4
335+
- name: Restore checkout
336+
uses: actions/cache/restore@v5
329337
id: cache-checkout
330338
with:
331339
path: ${{ env.wc }}
332340
key: checkout-${{ github.sha }}
341+
fail-on-cache-miss: true
333342

334343
- name: Dependencies (Ubuntu)
335344
if: matrix.os == 'ubuntu-22.04'
@@ -346,12 +355,13 @@ jobs:
346355
brew install bmake pcre
347356
${{ matrix.cc }} --version
348357
349-
- name: Fetch build
350-
uses: actions/cache@v4
358+
- name: Restore build
359+
uses: actions/cache/restore@v5
351360
id: cache-build
352361
with:
353362
path: ${{ env.build }}
354363
key: build-${{ matrix.make }}-${{ matrix.os }}-${{ matrix.cc }}-${{ matrix.debug }}-${{ matrix.san }}-${{ github.sha }}
364+
fail-on-cache-miss: true
355365

356366
- name: Get number of CPU cores
357367
uses: SimenB/github-actions-cpu-cores@v2
@@ -383,12 +393,13 @@ jobs:
383393
cc: gcc # it's clang anyway
384394

385395
steps:
386-
- name: Fetch checkout
387-
uses: actions/cache@v4
396+
- name: Restore checkout
397+
uses: actions/cache/restore@v5
388398
id: cache-checkout
389399
with:
390400
path: ${{ env.wc }}
391401
key: checkout-${{ github.sha }}
402+
fail-on-cache-miss: true
392403

393404
- name: Dependencies (Ubuntu)
394405
if: matrix.os == 'ubuntu-22.04'
@@ -405,12 +416,13 @@ jobs:
405416
brew install bmake
406417
${{ matrix.cc }} --version
407418
408-
- name: Fetch build
409-
uses: actions/cache@v4
419+
- name: Restore build
420+
uses: actions/cache/restore@v5
410421
id: cache-build
411422
with:
412423
path: ${{ env.build }}
413424
key: build-${{ matrix.make }}-${{ matrix.os }}-${{ matrix.cc }}-${{ matrix.debug }}-${{ matrix.san }}-${{ github.sha }}
425+
fail-on-cache-miss: true
414426

415427
# note we do the fuzzing unconditionally; each run adds to the corpus.
416428
#
@@ -515,15 +527,16 @@ jobs:
515527
sudo apt-get install golang
516528
go version
517529
518-
- name: Fetch build
519-
uses: actions/cache@v4
530+
- name: Restore build
531+
uses: actions/cache/restore@v5
520532
id: cache-build
521533
with:
522534
path: ${{ env.build }}
523535
key: build-${{ matrix.make }}-${{ matrix.os }}-${{ matrix.cc }}-${{ matrix.debug }}-${{ matrix.san }}-${{ github.sha }}
536+
fail-on-cache-miss: true
524537

525538
- name: Fetch converted PCRE tests
526-
uses: actions/cache@v4
539+
uses: actions/cache@v5
527540
id: cache-cvtpcre
528541
with:
529542
path: ${{ env.cvtpcre }}
@@ -542,7 +555,7 @@ jobs:
542555

543556
steps:
544557
- name: Cache docs
545-
uses: actions/cache@v4
558+
uses: actions/cache@v5
546559
id: cache-docs
547560
with:
548561
path: ${{ env.build }}
@@ -555,13 +568,14 @@ jobs:
555568
sudo apt-get update
556569
sudo apt-get install bmake libxml2-utils xsltproc docbook-xml docbook-xsl
557570
558-
- name: Fetch checkout
571+
- name: Restore checkout
559572
if: steps.cache-docs.outputs.cache-hit != 'true'
560-
uses: actions/cache@v4
573+
uses: actions/cache/restore@v5
561574
id: cache-checkout
562575
with:
563576
path: ${{ env.wc }}
564577
key: checkout-${{ github.sha }}
578+
fail-on-cache-miss: true
565579

566580
- name: Get number of CPU cores
567581
if: steps.cache-docs.outputs.cache-hit != 'true'
@@ -597,7 +611,7 @@ jobs:
597611

598612
steps:
599613
- name: Cache prefix
600-
uses: actions/cache@v4
614+
uses: actions/cache@v5
601615
id: cache-prefix
602616
with:
603617
path: ${{ env.prefix }}
@@ -609,29 +623,32 @@ jobs:
609623
uname -a
610624
sudo apt-get install bmake
611625
612-
- name: Fetch checkout
626+
- name: Restore checkout
613627
if: steps.cache-prefix.outputs.cache-hit != 'true'
614-
uses: actions/cache@v4
628+
uses: actions/cache/restore@v5
615629
id: cache-checkout
616630
with:
617631
path: ${{ env.wc }}
618632
key: checkout-${{ github.sha }}
633+
fail-on-cache-miss: true
619634

620-
- name: Fetch build
635+
- name: Restore build
621636
if: steps.cache-prefix.outputs.cache-hit != 'true'
622-
uses: actions/cache@v4
637+
uses: actions/cache/restore@v5
623638
id: cache-build
624639
with:
625640
path: ${{ env.build }}
626641
key: build-${{ env.make }}-${{ env.os }}-${{ env.cc }}-${{ env.debug }}-${{ env.san }}-${{ github.sha }}
642+
fail-on-cache-miss: true
627643

628-
- name: Fetch docs
644+
- name: Restore docs
629645
if: steps.cache-prefix.outputs.cache-hit != 'true'
630-
uses: actions/cache@v4
646+
uses: actions/cache/restore@v5
631647
id: cache-docs
632648
with:
633649
path: ${{ env.build }}
634650
key: docs-${{ github.sha }}
651+
fail-on-cache-miss: true
635652

636653
- name: Get number of CPU cores
637654
if: steps.cache-prefix.outputs.cache-hit != 'true'
@@ -670,12 +687,13 @@ jobs:
670687
sudo gem install --no-document fpm
671688
fpm -v
672689
673-
- name: Fetch prefix
674-
uses: actions/cache@v4
690+
- name: Restore prefix
691+
uses: actions/cache/restore@v5
675692
id: cache-prefix
676693
with:
677694
path: ${{ env.prefix }}
678695
key: prefix-${{ env.make }}-${{ env.os }}-${{ env.cc }}-${{ env.debug }}-${{ env.san }}-${{ github.sha }}
696+
fail-on-cache-miss: true
679697

680698
- name: Find version
681699
# TODO: would get a tag or branch name here

0 commit comments

Comments
 (0)