Skip to content

Commit 7d7f725

Browse files
committed
tmp1
1 parent b7c0a0b commit 7d7f725

File tree

2 files changed

+54
-2
lines changed

2 files changed

+54
-2
lines changed

.github/workflows/Java.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717

1818
format-check:
1919
name: Format Check
20+
if: ${{ false }}
2021
runs-on: ubuntu-latest
2122
steps:
2223
- uses: actions/checkout@v4
@@ -410,6 +411,50 @@ jobs:
410411
path: |
411412
build/release/duckdb_jdbc.jar
412413
414+
java-windows-aarch4:
415+
name: Java Windows (aarch4)
416+
runs-on: windows-11-arm
417+
# needs: java-linux-amd64
418+
steps:
419+
- uses: actions/checkout@v4
420+
with:
421+
fetch-depth: 0
422+
ref: ${{ inputs.git_ref }}
423+
424+
- uses: actions/setup-python@v5
425+
with:
426+
python-version: "3.12"
427+
428+
- name: Build
429+
shell: bash
430+
run: make release
431+
432+
- name: List Symbols
433+
shell: cmd
434+
run: |
435+
call "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
436+
dumpbin.exe /exports build\release\Release\libduckdb_java.so_windows_arm64
437+
438+
- name: Java Tests
439+
if: ${{ inputs.skip_tests != 'true' }}
440+
shell: bash
441+
run: |
442+
ls -R .
443+
make test || true
444+
445+
- name: Deploy
446+
shell: bash
447+
run: |
448+
cp build/release/duckdb_jdbc.jar duckdb_jdbc-windows-aarch64.jar
449+
./scripts/upload-assets-to-staging.sh github_release duckdb_jdbc-windows-aarch64.jar
450+
451+
- uses: actions/upload-artifact@v4
452+
with:
453+
name: java-windows-aarch64
454+
path: |
455+
build/release/duckdb_jdbc.jar
456+
457+
413458
java-osx-universal:
414459
name: Java OSX (Universal)
415460
runs-on: macos-14
@@ -461,6 +506,7 @@ jobs:
461506
- java-linux-amd64-musl
462507
- java-linux-aarch64-musl
463508
- java-windows-amd64
509+
- java-windows-aarch64
464510
- java-osx-universal
465511

466512
steps:
@@ -496,6 +542,11 @@ jobs:
496542
name: java-windows-amd64
497543
path: jdbc-artifacts/java-windows-amd64
498544

545+
- uses: actions/download-artifact@v4
546+
with:
547+
name: java-windows-aarch64
548+
path: jdbc-artifacts/java-windows-aarch64
549+
499550
- uses: actions/download-artifact@v4
500551
with:
501552
name: java-osx-universal
@@ -530,6 +581,7 @@ jobs:
530581
- java-linux-amd64-musl
531582
- java-linux-aarch64-musl
532583
- java-windows-amd64
584+
- java-windows-aarch64
533585
- java-osx-universal
534586
runs-on: ubuntu-latest
535587
steps:

scripts/jdbc_maven_deploy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ def exec(cmd):
5959
jdbc_root_path = sys.argv[3]
6060

6161
combine_builds = ['linux-amd64', 'osx-universal', 'windows-amd64', 'linux-aarch64']
62-
arch_specific_builds = ['linux-amd64-musl', 'linux-aarch64-musl']
63-
arch_specific_classifiers = ['linux_amd64_musl', 'linux_aarch64_musl']
62+
arch_specific_builds = ['linux-amd64-musl', 'linux-aarch64-musl', 'windows-aarch64']
63+
arch_specific_classifiers = ['linux_amd64_musl', 'linux_aarch64_musl', 'windows_aarch64']
6464

6565
staging_dir = tempfile.mkdtemp()
6666

0 commit comments

Comments
 (0)