Skip to content

Commit 8a37a9d

Browse files
emmanuel-kelleremmanuel-keller
authored
Prepare Java SDK for JDK 25 (LTS), harden CI, and upgrade build tooling (#133)
1 parent c015686 commit 8a37a9d

16 files changed

Lines changed: 246 additions & 146 deletions

File tree

‎.github/workflows/cross.yml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout repository
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
3636

3737
- name: Cache Rust
38-
uses: Swatinem/rust-cache@v2
38+
uses: Swatinem/rust-cache@42dc69e1aa15d09112580998cf2ef0119e2e91ae # v2
3939

4040
- name: Install dependencies
4141
run: sudo apt-get update -y
4242

4343
- name: Set up Rust
44-
uses: dtolnay/rust-toolchain@stable
44+
uses: dtolnay/rust-toolchain@631a55b12751854ce901bb631d5902ceb48146f7 # stable
4545
with:
4646
toolchain: stable
4747
targets: ${{ matrix.target }}
@@ -55,7 +55,7 @@ jobs:
5555
run: cargo ndk -t ${{ matrix.ndk }} build --release
5656

5757
- name: Upload so lib
58-
uses: actions/upload-artifact@v4
58+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
5959
with:
6060
name: ${{ matrix.target }}
6161
path: target/${{ matrix.target }}/release/*.so
@@ -81,18 +81,18 @@ jobs:
8181
runs-on: ubuntu-latest
8282
steps:
8383
- name: Checkout repository
84-
uses: actions/checkout@v4
84+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
8585

8686
- name: Cache Rust
87-
uses: Swatinem/rust-cache@v2
87+
uses: Swatinem/rust-cache@42dc69e1aa15d09112580998cf2ef0119e2e91ae # v2
8888

8989
- name: Install dependencies
9090
run: |
9191
sudo apt-get update
9292
sudo apt-get install -y ${{ matrix.apt-get }}
9393
9494
- name: Set up Rust
95-
uses: dtolnay/rust-toolchain@stable
95+
uses: dtolnay/rust-toolchain@631a55b12751854ce901bb631d5902ceb48146f7 # stable
9696
with:
9797
toolchain: stable
9898
targets: ${{ matrix.target }}
@@ -105,7 +105,7 @@ jobs:
105105
cargo build --target ${{ matrix.target }} --release
106106
107107
- name: Upload artifact
108-
uses: actions/upload-artifact@v4
108+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
109109
with:
110110
name: ${{ matrix.target }}
111111
path: target/${{ matrix.target }}/release/*.so
@@ -117,13 +117,13 @@ jobs:
117117
runs-on: windows-latest
118118
steps:
119119
- name: Checkout repository
120-
uses: actions/checkout@v4
120+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
121121

122122
- name: Cache Rust
123-
uses: Swatinem/rust-cache@v2
123+
uses: Swatinem/rust-cache@42dc69e1aa15d09112580998cf2ef0119e2e91ae # v2
124124

125125
- name: Set up Rust
126-
uses: dtolnay/rust-toolchain@stable
126+
uses: dtolnay/rust-toolchain@631a55b12751854ce901bb631d5902ceb48146f7 # stable
127127
with:
128128
toolchain: stable
129129
target: ${{ matrix.arch }}-pc-windows-msvc
@@ -134,7 +134,7 @@ jobs:
134134
run: cargo build --target ${{ matrix.arch }}-pc-windows-msvc --release
135135

136136
- name: Upload artifact
137-
uses: actions/upload-artifact@v4
137+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
138138
with:
139139
name: ${{ matrix.arch }}-pc-windows-msvc
140140
path: target/${{ matrix.arch }}-pc-windows-msvc/release/*.dll
@@ -150,13 +150,13 @@ jobs:
150150
runs-on: ${{ matrix.runs-on }}
151151
steps:
152152
- name: Checkout repository
153-
uses: actions/checkout@v4
153+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
154154

155155
- name: Cache Rust
156-
uses: Swatinem/rust-cache@v2
156+
uses: Swatinem/rust-cache@42dc69e1aa15d09112580998cf2ef0119e2e91ae # v2
157157

158158
- name: Set up Rust
159-
uses: dtolnay/rust-toolchain@stable
159+
uses: dtolnay/rust-toolchain@631a55b12751854ce901bb631d5902ceb48146f7 # stable
160160
with:
161161
toolchain: stable
162162

@@ -166,7 +166,7 @@ jobs:
166166
run: cargo build --target ${{ matrix.arch }}-apple-darwin --release
167167

168168
- name: Upload artifact
169-
uses: actions/upload-artifact@v4
169+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
170170
with:
171171
name: ${{ matrix.arch }}-apple-darwin
172172
path: target/${{ matrix.arch }}-apple-darwin/release/*.dylib
@@ -183,13 +183,13 @@ jobs:
183183
run: sudo apt-get update
184184

185185
- name: Checkout repository
186-
uses: actions/checkout@v4
186+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
187187

188-
- name: Set up JDK 22
189-
uses: actions/setup-java@v4
188+
- name: Set up JDK
189+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
190190
with:
191191
distribution: 'temurin'
192-
java-version: 22
192+
java-version: 25
193193

194194
- name: Gradle
195195
run: chmod +x gradlew
@@ -210,74 +210,74 @@ jobs:
210210
mkdir -p src/main/resources/natives/windows_32
211211
212212
- name: Download Android 64 intel
213-
uses: actions/download-artifact@v4
213+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
214214
with:
215215
name: x86_64-linux-android
216216
path: src/main/resources/natives/android_64
217217

218218
- name: Download Android 32 intel
219-
uses: actions/download-artifact@v4
219+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
220220
with:
221221
name: i686-linux-android
222222
path: src/main/resources/natives/android_32
223223

224224
- name: Download Android 64 arm
225-
uses: actions/download-artifact@v4
225+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
226226
with:
227227
name: aarch64-linux-android
228228
path: src/main/resources/natives/android_arm64
229229

230230
- name: Download Android 32 arm
231-
uses: actions/download-artifact@v4
231+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
232232
with:
233233
name: armv7-linux-androideabi
234234
path: src/main/resources/natives/android_arm32
235235

236236
- name: Download Linux 64 intel
237-
uses: actions/download-artifact@v4
237+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
238238
with:
239239
name: x86_64-unknown-linux-gnu
240240
path: src/main/resources/natives/linux_64
241241

242242
- name: Download Linux 32 intel
243-
uses: actions/download-artifact@v4
243+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
244244
continue-on-error: true
245245
with:
246246
name: i686-unknown-linux-gnu
247247
path: src/main/resources/natives/linux_32
248248

249249
- name: Download Linux 64 arm
250-
uses: actions/download-artifact@v4
250+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
251251
with:
252252
name: aarch64-unknown-linux-gnu
253253
path: src/main/resources/natives/linux_arm64
254254

255255
- name: Download Linux 32 arm
256-
uses: actions/download-artifact@v4
256+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
257257
with:
258258
name: armv7-unknown-linux-gnueabihf
259259
path: src/main/resources/natives/linux_arm32
260260

261261
- name: Download Darwin 64 intel
262-
uses: actions/download-artifact@v4
262+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
263263
with:
264264
name: x86_64-apple-darwin
265265
path: src/main/resources/natives/osx_64
266266

267267
- name: Download Darwin 64 arm
268-
uses: actions/download-artifact@v4
268+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
269269
with:
270270
name: aarch64-apple-darwin
271271
path: src/main/resources/natives/osx_arm64
272272

273273
- name: Download Windows 64 intel
274-
uses: actions/download-artifact@v4
274+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
275275
with:
276276
name: x86_64-pc-windows-msvc
277277
path: src/main/resources/natives/windows_64
278278

279279
- name: Download Windows 32 intel
280-
uses: actions/download-artifact@v4
280+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
281281
with:
282282
name: i686-pc-windows-msvc
283283
path: src/main/resources/natives/windows_32
@@ -290,13 +290,13 @@ jobs:
290290
run: ./gradlew jar
291291

292292
- name: Upload JAR artifact
293-
uses: actions/upload-artifact@v4
293+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
294294
with:
295295
name: surrealdb
296296
path: build/libs/surrealdb-${{ steps.version.outputs.VERSION }}.jar
297297

298298
- name: Start SurrealDB
299-
uses: surrealdb/setup-surreal@v2
299+
uses: surrealdb/setup-surreal@7c103070ba4f544240cd287432ba70d6f50163a5 # v2
300300
with:
301301
surrealdb_version: v3.0.4
302302
surrealdb_port: 8000
@@ -319,13 +319,13 @@ jobs:
319319
- aggregated-jar
320320
steps:
321321
- name: Checkout repository
322-
uses: actions/checkout@v4
322+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
323323

324-
- name: Set up JDK 22
325-
uses: actions/setup-java@v4
324+
- name: Set up JDK
325+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
326326
with:
327327
distribution: 'temurin'
328-
java-version: 22
328+
java-version: 25
329329

330330
- name: Gradle
331331
run: chmod +x gradlew
@@ -334,14 +334,14 @@ jobs:
334334
run: mkdir -p native
335335

336336
- name: Download JAR
337-
uses: actions/download-artifact@v4
337+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
338338
with:
339339
name: surrealdb
340340
path: native
341341

342342
- name: Start SurrealDB
343343
if: runner.os != 'Windows'
344-
uses: surrealdb/setup-surreal@v2
344+
uses: surrealdb/setup-surreal@7c103070ba4f544240cd287432ba70d6f50163a5 # v2
345345
with:
346346
surrealdb_version: v3.0.4
347347
surrealdb_port: 8000
@@ -364,19 +364,19 @@ jobs:
364364
contents: read
365365
packages: write
366366
steps:
367-
- uses: actions/checkout@v4
367+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
368368

369-
- name: Set up JDK 22
370-
uses: actions/setup-java@v4
369+
- name: Set up JDK
370+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
371371
with:
372372
distribution: 'temurin'
373-
java-version: 22
373+
java-version: 25
374374

375375
- name: Create directory native
376376
run: mkdir -p native
377377

378378
- name: Download JAR
379-
uses: actions/download-artifact@v4
379+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
380380
with:
381381
name: surrealdb
382382
path: native

‎.github/workflows/reports.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ jobs:
1717
run: sudo apt-get update
1818

1919
- name: Install Rust
20-
uses: dtolnay/rust-toolchain@stable
20+
uses: dtolnay/rust-toolchain@631a55b12751854ce901bb631d5902ceb48146f7 # stable
2121
with:
2222
toolchain: stable
2323

24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
2525

2626
- name: Cache Rust
27-
uses: Swatinem/rust-cache@v2
27+
uses: Swatinem/rust-cache@42dc69e1aa15d09112580998cf2ef0119e2e91ae # v2
2828

29-
- name: Set up JDK 22
30-
uses: actions/setup-java@v4
29+
- name: Set up JDK
30+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
3131
with:
3232
distribution: 'temurin'
33-
java-version: 22
33+
java-version: 25
3434

3535
- name: Build native lib
3636
env:
@@ -41,7 +41,7 @@ jobs:
4141
run: chmod +x gradlew
4242

4343
- name: Start SurrealDB
44-
uses: surrealdb/setup-surreal@v2
44+
uses: surrealdb/setup-surreal@7c103070ba4f544240cd287432ba70d6f50163a5 # v2
4545
with:
4646
surrealdb_version: v3.0.4
4747
surrealdb_port: 8000
@@ -64,7 +64,7 @@ jobs:
6464
run: ./gradlew -i clean createCombinedReport
6565

6666
- name: Deploy
67-
uses: peaceiris/actions-gh-pages@v4
67+
uses: peaceiris/actions-gh-pages@e9c66a37f080288a11235e32cbe2dc5fb3a679cc # v4
6868
if: github.ref == 'refs/heads/main'
6969
with:
7070
github_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/test.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
java: [ '8', '11', '17', '21', '22' ]
20+
java: [ '8', '11', '17', '21', '25' ]
2121

2222
steps:
2323
- name: Install Rust
24-
uses: dtolnay/rust-toolchain@stable
24+
uses: dtolnay/rust-toolchain@631a55b12751854ce901bb631d5902ceb48146f7 # stable
2525
with:
2626
toolchain: stable
2727
components: clippy,rustfmt
2828

29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
3030

3131
- name: Cache Rust
32-
uses: Swatinem/rust-cache@v2
32+
uses: Swatinem/rust-cache@42dc69e1aa15d09112580998cf2ef0119e2e91ae # v2
3333

3434
- name: Install dependencies
3535
run: sudo apt-get update
3636

3737
- name: Set up JDK ${{ matrix.java }}
38-
uses: actions/setup-java@v4
38+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
3939
with:
4040
distribution: 'temurin'
4141
java-version: ${{ matrix.java }}
@@ -44,7 +44,7 @@ jobs:
4444
run: cargo build
4545

4646
- name: Start SurrealDB
47-
uses: surrealdb/setup-surreal@v2
47+
uses: surrealdb/setup-surreal@7c103070ba4f544240cd287432ba70d6f50163a5 # v2
4848
with:
4949
surrealdb_version: v3.0.4
5050
surrealdb_port: 8000

‎Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)