@@ -20,15 +20,19 @@ jobs:
2020 pre-commit:
2121 runs-on: ubuntu-24.04
2222 steps:
23- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
23+ - uses: actions/checkout@v4
2424 with:
2525 fetch-depth: 0
2626
27+ <<<<<<< before updating
2728 - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
29+ =======
30+ - uses: actions/setup-python@v5
31+ >>>>>>> after updating
2832 with:
2933 python-version: 3.11
3034
31- - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
35+ - uses: pre-commit/action@v3.0.1
3236 with:
3337 extra_args: --hook-stage manual --all-files
3438
@@ -47,12 +51,16 @@ jobs:
4751 name: check • ${{ matrix.triplet }} • ${{ matrix.compiler }} • c++${{ matrix.std }} • ${{ matrix.build_type }}
4852
4953 steps:
50- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
54+ - uses: actions/checkout@v4
5155 with:
5256 fetch-depth: 0
5357
5458 - name: Cache
59+ <<<<<<< before updating
5560 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
61+ =======
62+ uses: actions/cache@v4
63+ >>>>>>> after updating
5664 with:
5765 path: |
5866 ~/vcpkg
@@ -124,12 +132,16 @@ jobs:
124132 name: check • ${{ matrix.triplet }} • ${{ matrix.compiler }} • c++${{ matrix.std }} • ${{ matrix.build_type }}
125133
126134 steps:
127- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
135+ - uses: actions/checkout@v4
128136 with:
129137 fetch-depth: 0
130138
131139 - name: Cache
140+ <<<<<<< before updating
132141 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
142+ =======
143+ uses: actions/cache@v4
144+ >>>>>>> after updating
133145 with:
134146 path: |
135147 ~/vcpkg
@@ -202,12 +214,16 @@ jobs:
202214 name: check • ${{ matrix.triplet }} • ${{ matrix.compiler }} • c++${{ matrix.std }} • ${{ matrix.build_type }}
203215
204216 steps:
205- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
217+ - uses: actions/checkout@v4
206218 with:
207219 fetch-depth: 0
208220
209221 - name: Cache
222+ <<<<<<< before updating
210223 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
224+ =======
225+ uses: actions/cache@v4
226+ >>>>>>> after updating
211227 with:
212228 path: |
213229 ~/vcpkg
@@ -267,12 +283,16 @@ jobs:
267283 name: check • ${{ matrix.triplet }} • ${{ matrix.compiler }} • c++${{ matrix.std }} • ${{ matrix.build_type }}
268284
269285 steps:
270- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
286+ - uses: actions/checkout@v4
271287 with:
272288 fetch-depth: 0
273289
274290 - name: Cache
291+ <<<<<<< before updating
275292 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
293+ =======
294+ uses: actions/cache@v4
295+ >>>>>>> after updating
276296 with:
277297 path: |
278298 ~/vcpkg
@@ -289,7 +309,11 @@ jobs:
289309 ninja: true
290310 ccache: true
291311
312+ <<<<<<< before updating
292313 - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
314+ =======
315+ - uses: actions/setup-python@v5
316+ >>>>>>> after updating
293317 with:
294318 python-version: 3.x
295319
@@ -335,12 +359,16 @@ jobs:
335359 name: check • sanitizers • ${{ matrix.sanitizer }} • ${{ matrix.build_type }}
336360
337361 steps:
338- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
362+ - uses: actions/checkout@v4
339363 with:
340364 fetch-depth: 0
341365
342366 - name: Cache
367+ <<<<<<< before updating
343368 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
369+ =======
370+ uses: actions/cache@v4
371+ >>>>>>> after updating
344372 with:
345373 path: |
346374 ~/vcpkg
@@ -382,12 +410,16 @@ jobs:
382410 name: check • valgrind • ${{ matrix.build_type }}
383411
384412 steps:
385- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
413+ - uses: actions/checkout@v4
386414 with:
387415 fetch-depth: 0
388416
389417 - name: Cache
418+ <<<<<<< before updating
390419 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
420+ =======
421+ uses: actions/cache@v4
422+ >>>>>>> after updating
391423 with:
392424 path: |
393425 ~/vcpkg
@@ -433,7 +465,11 @@ jobs:
433465
434466 - name: Upload test results
435467 if: failure()
468+ <<<<<<< before updating
436469 uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
470+ =======
471+ uses: actions/upload-artifact@v4
472+ >>>>>>> after updating
437473 with:
438474 name: valgrind-results
439475 path: out/valgrind-results.tar.gz
@@ -443,12 +479,16 @@ jobs:
443479 needs: [pre-commit]
444480
445481 steps:
446- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
482+ - uses: actions/checkout@v4
447483 with:
448484 fetch-depth: 0
449485
450486 - name: Cache
487+ <<<<<<< before updating
451488 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
489+ =======
490+ uses: actions/cache@v4
491+ >>>>>>> after updating
452492 with:
453493 path: |
454494 ~/vcpkg
@@ -463,7 +503,11 @@ jobs:
463503 ninja: true
464504 ccache: true
465505
506+ <<<<<<< before updating
466507 - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
508+ =======
509+ - uses: actions/setup-python@v5
510+ >>>>>>> after updating
467511 with:
468512 python-version: 3.x
469513
@@ -491,12 +535,16 @@ jobs:
491535 needs: [pre-commit]
492536
493537 steps:
494- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
538+ - uses: actions/checkout@v4
495539 with:
496540 fetch-depth: 0
497541
498542 - name: Cache
543+ <<<<<<< before updating
499544 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
545+ =======
546+ uses: actions/cache@v4
547+ >>>>>>> after updating
500548 with:
501549 path: |
502550 ~/vcpkg
@@ -511,7 +559,11 @@ jobs:
511559 ninja: true
512560 ccache: true
513561
562+ <<<<<<< before updating
514563 - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
564+ =======
565+ - uses: actions/setup-python@v5
566+ >>>>>>> after updating
515567 with:
516568 python-version: 3.x
517569
@@ -539,12 +591,16 @@ jobs:
539591 needs: [pre-commit]
540592
541593 steps:
542- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
594+ - uses: actions/checkout@v4
543595 with:
544596 fetch-depth: 0
545597
546598 - name: Cache
599+ <<<<<<< before updating
547600 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
601+ =======
602+ uses: actions/cache@v4
603+ >>>>>>> after updating
548604 with:
549605 path: |
550606 ~/vcpkg
@@ -562,7 +618,11 @@ jobs:
562618 doxygen: true
563619 graphviz: true
564620
621+ <<<<<<< before updating
565622 - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
623+ =======
624+ - uses: actions/setup-python@v5
625+ >>>>>>> after updating
566626 with:
567627 python-version: 3.x
568628
@@ -584,12 +644,16 @@ jobs:
584644 needs: [pre-commit]
585645
586646 steps:
587- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
647+ - uses: actions/checkout@v4
588648 with:
589649 fetch-depth: 0
590650
591651 - name: Cache
652+ <<<<<<< before updating
592653 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
654+ =======
655+ uses: actions/cache@v4
656+ >>>>>>> after updating
593657 with:
594658 path: |
595659 ~/vcpkg
0 commit comments