@@ -106,35 +106,44 @@ jobs:
106106 if-no-files-found : error
107107
108108 prepare-java-linux :
109- runs-on : ${{ matrix.target.runs-on }}
110- container :
111- image : " ubuntu:20.04"
112109 timeout-minutes : 30
113110 strategy :
114111 fail-fast : false
115112 matrix :
116- target :
117- - { os: ubuntu, runs-on: "ubuntu-24.04-arm", target: aarch64-unknown-linux-gnu }
118- - { os: ubuntu, runs-on: "ubuntu-24.04", target: x86_64-unknown-linux-gnu }
113+ include :
114+ - target : x86_64-unknown-linux-gnu
115+ runner : runs-on=${{ github.run_id }}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/tag=prepare-java-linux-amd64
116+ fallback_runner : ubuntu-24.04
117+ - target : aarch64-unknown-linux-gnu
118+ runner : runs-on=${{ github.run_id }}/runner=arm64-medium/image=ubuntu24-full-arm64-pre-v2/tag=prepare-java-linux-arm64
119+ fallback_runner : ubuntu-24.04-arm
120+ runs-on : >-
121+ ${{ github.repository == 'vortex-data/vortex'
122+ && matrix.runner
123+ || matrix.fallback_runner }}
119124 steps :
125+ - uses : runs-on/action@v2
126+ if : github.repository == 'vortex-data/vortex'
127+ with :
128+ sccache : s3
120129 - uses : actions/checkout@v6
121130 with :
122131 fetch-depth : 0
123- - uses : ./.github/actions/prepare-java-linux
124132 - uses : actions/setup-java@v5
125133 with :
126134 distribution : " corretto"
127135 java-version : " 17"
128- - uses : ./.github/actions/setup-rust
136+ - uses : ./.github/actions/setup-prebuild
137+ - uses : mlugg/setup-zig@v2.2.1
138+ - name : Install cargo-zigbuild
139+ uses : taiki-e/cache-cargo-install-action@66c9585ef5ca780ee69399975a5e911f47905995
129140 with :
130- targets : ${{ matrix.target.target }}
131- repo-token : ${{ secrets.GITHUB_TOKEN }}
132- enable-sccache : " false"
133- - run : cargo build --release --package vortex-jni
141+ tool : cargo-zigbuild
142+ - run : cargo zigbuild --release --target ${{ matrix.target }}.2.31 --package vortex-jni
134143 - uses : actions/upload-artifact@v7
135144 with :
136- name : " libvortex_jni_${{ matrix.target.target }}.zip"
137- path : " target/release/libvortex_jni.so"
145+ name : " libvortex_jni_${{ matrix.target }}.zip"
146+ path : " target/${{ matrix.target }}/ release/libvortex_jni.so"
138147 retention-days : 7
139148 if-no-files-found : error
140149
0 commit comments