Skip to content

Commit 58ea257

Browse files
committed
CCache minor fixes on CI (1.5)
This is a backport of the PR #560 to `v1.5-variegata` stable branch.
1 parent 93dcf88 commit 58ea257

1 file changed

Lines changed: 49 additions & 42 deletions

File tree

.github/workflows/Java.yml

Lines changed: 49 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ jobs:
5656
with:
5757
docker_image: '${{ env.MANYLINUX_IMAGE }}'
5858

59+
- name: Save Cache
60+
uses: actions/cache/save@v4
61+
with:
62+
path: ${{ github.workspace }}/ccache
63+
key: ${{ steps.cache_key.outputs.value }}
64+
5965
- name: List Symbols
6066
run: |
6167
nm -gU ./build/release/libduckdb_java.so_linux_amd64
@@ -88,12 +94,6 @@ jobs:
8894
path: |
8995
build/release/duckdb_jdbc.jar
9096
91-
- name: Save Cache
92-
uses: actions/cache/save@v4
93-
with:
94-
path: ${{ github.workspace }}/ccache
95-
key: ${{ steps.cache_key.outputs.value }}
96-
9797
java-linux-amd64-tck:
9898
name: Linux TCK (amd64)
9999
runs-on: ubuntu-latest
@@ -274,6 +274,12 @@ jobs:
274274
with:
275275
docker_image: '${{ env.MANYLINUX_IMAGE }}'
276276

277+
- name: Save Cache
278+
uses: actions/cache/save@v4
279+
with:
280+
path: ${{ github.workspace }}/ccache
281+
key: ${{ steps.cache_key.outputs.value }}
282+
277283
- name: List Symbols
278284
run: |
279285
nm -gU ./build/release/libduckdb_java.so_linux_arm64
@@ -300,12 +306,6 @@ jobs:
300306
path: |
301307
build/release/duckdb_jdbc.jar
302308
303-
- name: Save Cache
304-
uses: actions/cache/save@v4
305-
with:
306-
path: ${{ github.workspace }}/ccache
307-
key: ${{ steps.cache_key.outputs.value }}
308-
309309
java-linux-amd64-musl:
310310
name: Linux (amd64-musl)
311311
runs-on: ubuntu-latest
@@ -335,6 +335,12 @@ jobs:
335335
with:
336336
docker_image: '${{ env.ALPINE_IMAGE }}'
337337

338+
- name: Save Cache
339+
uses: actions/cache/save@v4
340+
with:
341+
path: ${{ github.workspace }}/ccache
342+
key: ${{ steps.cache_key.outputs.value }}
343+
338344
- name: List Symbols
339345
run: |
340346
nm -gU ./build/release/libduckdb_java.so_linux_amd64
@@ -357,12 +363,6 @@ jobs:
357363
path: |
358364
build/release/duckdb_jdbc.jar
359365
360-
- name: Save Cache
361-
uses: actions/cache/save@v4
362-
with:
363-
path: ${{ github.workspace }}/ccache
364-
key: ${{ steps.cache_key.outputs.value }}
365-
366366
java-linux-aarch64-musl:
367367
name: Linux (aarch64-musl)
368368
runs-on: ubuntu-24.04-arm
@@ -392,6 +392,12 @@ jobs:
392392
with:
393393
docker_image: '${{ env.ALPINE_IMAGE }}'
394394

395+
- name: Save Cache
396+
uses: actions/cache/save@v4
397+
with:
398+
path: ${{ github.workspace }}/ccache
399+
key: ${{ steps.cache_key.outputs.value }}
400+
395401
- name: List Symbols
396402
run: |
397403
nm -gU ./build/release/libduckdb_java.so_linux_arm64
@@ -414,12 +420,6 @@ jobs:
414420
path: |
415421
build/release/duckdb_jdbc.jar
416422
417-
- name: Save Cache
418-
uses: actions/cache/save@v4
419-
with:
420-
path: ${{ github.workspace }}/ccache
421-
key: ${{ steps.cache_key.outputs.value }}
422-
423423
java-windows-amd64:
424424
name: Windows (amd64)
425425
runs-on: windows-latest
@@ -434,6 +434,13 @@ jobs:
434434
fetch-depth: 0
435435
ref: ${{ inputs.git_ref }}
436436

437+
- name: Dependencies
438+
shell: bash
439+
run: |
440+
choco install \
441+
ccache \
442+
-y --force --no-progress
443+
437444
- name: Cache Key
438445
id: cache_key
439446
shell: bash
@@ -459,6 +466,12 @@ jobs:
459466
cmake ../.. -G Ninja -DCMAKE_BUILD_TYPE=Release
460467
cmake --build . --config Release
461468
469+
- name: Save Cache
470+
uses: actions/cache/save@v4
471+
with:
472+
path: ${{ github.workspace }}/ccache
473+
key: ${{ steps.cache_key.outputs.value }}
474+
462475
- name: List Symbols
463476
shell: cmd
464477
run: |
@@ -485,12 +498,6 @@ jobs:
485498
path: |
486499
build/release/duckdb_jdbc.jar
487500
488-
- name: Save Cache
489-
uses: actions/cache/save@v4
490-
with:
491-
path: ${{ github.workspace }}/ccache
492-
key: ${{ steps.cache_key.outputs.value }}
493-
494501
java-windows-aarch64:
495502
name: Windows (aarch64)
496503
runs-on: windows-11-arm
@@ -541,6 +548,12 @@ jobs:
541548
cmake ../.. -G Ninja -DCMAKE_BUILD_TYPE=Release
542549
cmake --build . --config Release
543550
551+
- name: Save Cache
552+
uses: actions/cache/save@v4
553+
with:
554+
path: ${{ github.workspace }}/ccache
555+
key: ${{ steps.cache_key.outputs.value }}
556+
544557
- name: List Symbols
545558
shell: cmd
546559
run: |
@@ -567,12 +580,6 @@ jobs:
567580
path: |
568581
build/release/duckdb_jdbc.jar
569582
570-
- name: Save Cache
571-
uses: actions/cache/save@v4
572-
with:
573-
path: ${{ github.workspace }}/ccache
574-
key: ${{ steps.cache_key.outputs.value }}
575-
576583
java-osx-universal:
577584
name: macOS (Universal)
578585
runs-on: macos-latest
@@ -614,6 +621,12 @@ jobs:
614621
shell: bash
615622
run: make release
616623

624+
- name: Save Cache
625+
uses: actions/cache/save@v4
626+
with:
627+
path: ${{ github.workspace }}/ccache
628+
key: ${{ steps.cache_key.outputs.value }}
629+
617630
- name: List Symbols
618631
run: |
619632
nm -gU ./build/release/libduckdb_java.so_osx_universal
@@ -639,12 +652,6 @@ jobs:
639652
path: |
640653
build/release/duckdb_jdbc.jar
641654
642-
- name: Save Cache
643-
uses: actions/cache/save@v4
644-
with:
645-
path: ${{ github.workspace }}/ccache
646-
key: ${{ steps.cache_key.outputs.value }}
647-
648655
maven-deploy:
649656
if: ${{ github.repository == 'duckdb/duckdb-java' && inputs.override_git_describe == '' && startsWith(github.ref, 'refs/tags/') }}
650657
name: Maven Deploy

0 commit comments

Comments
 (0)