Skip to content

Commit c0b064a

Browse files
authored
Merge branch 'main' into fast-reflect
2 parents 2db692e + aa3dc73 commit c0b064a

File tree

22 files changed

+80
-841
lines changed

22 files changed

+80
-841
lines changed

.github/workflows/build-natives.yml

Lines changed: 16 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,7 @@ on:
1616
branches:
1717
- main
1818

19-
env:
20-
MACOSX_DEPLOYMENT_TARGET: "10.10"
21-
2219
jobs:
23-
apple-natives:
24-
runs-on: macos-13
25-
steps:
26-
- uses: actions/checkout@v4
27-
with:
28-
submodules: 'recursive'
29-
- name: Set up JDK 17
30-
uses: actions/setup-java@v4
31-
with:
32-
distribution: 'temurin'
33-
java-version: '17'
34-
- run: echo "JAVA_17=$JAVA_HOME" >> $GITHUB_ENV
35-
- name: Set up Gradle
36-
uses: gradle/actions/setup-gradle@v3
37-
- name: Build natives
38-
run: |
39-
./gradlew jniGen jnigenBuildMacOsX64 jnigenBuildMacOsXARM64 jnigenBuildIOS
40-
- name: Test
41-
run: |
42-
./gradlew :example:test :jsr223:test :jpms-example:run
43-
- name: Upload macOS natives
44-
uses: actions/upload-artifact@v4
45-
with:
46-
name: apple-natives
47-
path: ./*/libs
48-
retention-days: 5
4920
most-natives:
5021
environment: Codecov
5122
runs-on: ubuntu-20.04
@@ -217,86 +188,12 @@ jobs:
217188
- name: Test
218189
run: |
219190
./gradlew --info --stacktrace :example:test :jsr223:test :jpms-example:run
220-
android-testing:
221-
runs-on: ubuntu-latest
222-
strategy:
223-
matrix:
224-
api-level: [ 21 ]
225-
android-arch: [ 'x86_64', 'x86' ]
226-
include:
227-
- api-level: 24
228-
android-arch: 'x86'
229-
- api-level: 33
230-
android-arch: 'x86_64'
231-
needs:
232-
- most-natives
233-
steps:
234-
- uses: actions/checkout@v4
235-
with:
236-
submodules: 'recursive'
237-
- name: Set up JDK 8
238-
uses: actions/setup-java@v4
239-
with:
240-
distribution: 'temurin'
241-
java-version: '8'
242-
- run: echo "JAVA_8=$JAVA_HOME" >> $GITHUB_ENV
243-
- name: Set up JDK 11
244-
uses: actions/setup-java@v4
245-
with:
246-
distribution: 'temurin'
247-
java-version: '11'
248-
- run: echo "JAVA_11=$JAVA_HOME" >> $GITHUB_ENV
249-
- name: Set up Gradle
250-
uses: gradle/actions/setup-gradle@v3
251-
- name: Download most-natives artifact
252-
uses: actions/download-artifact@v4
253-
with:
254-
name: most-natives
255-
- name: JniGen
256-
run: |
257-
./gradlew jniGen
258-
- name: Pack Android natives
259-
run: |
260-
./gradlew :android:assemble
261-
- name: AVD cache
262-
uses: actions/cache@v4
263-
id: avd-cache
264-
with:
265-
path: |
266-
~/.android/avd/*
267-
~/.android/adb*
268-
key: avd-${{ matrix.api-level }}-${{ matrix.android-arch }}
269-
- name: Enable KVM for linux runners
270-
run: |
271-
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
272-
sudo udevadm control --reload-rules
273-
sudo udevadm trigger --name-match=kvm
274-
- name: Create AVD and generate snapshot for caching
275-
if: steps.avd-cache.outputs.cache-hit != 'true'
276-
uses: reactivecircus/android-emulator-runner@v2
277-
with:
278-
api-level: ${{ matrix.api-level }}
279-
arch: ${{ matrix.android-arch }}
280-
force-avd-creation: false
281-
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
282-
disable-animations: false
283-
script: echo "Generated AVD snapshot for caching."
284-
- name: Test on Android AVD
285-
uses: reactivecircus/android-emulator-runner@v2
286-
with:
287-
api-level: ${{ matrix.api-level }}
288-
arch: ${{ matrix.android-arch }}
289-
force-avd-creation: false
290-
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
291-
disable-animations: true
292-
script: ./gradlew --info --stacktrace :android:android-test:connectedAndroidTest
191+
293192
pack-natives:
294193
environment: OSSRH
295194
needs:
296-
- apple-natives
297195
- most-natives
298196
- windows-testing
299-
- android-testing
300197
- linux-testing
301198
runs-on: ubuntu-20.04
302199
steps:
@@ -335,9 +232,9 @@ jobs:
335232
ant -f lua53/jni/build.xml pack-natives
336233
ant -f lua54/jni/build.xml pack-natives
337234
ant -f luajit/jni/build.xml pack-natives
338-
- name: Pack Android AAR
339-
run: |
340-
./gradlew :android:assemble
235+
# - name: Pack Android AAR
236+
# run: |
237+
# ./gradlew :android:assemble
341238
- name: Upload artifacts
342239
uses: actions/upload-artifact@v4
343240
with:
@@ -374,18 +271,18 @@ jobs:
374271
with:
375272
draft: true
376273
files: example/build/libs/example-all.jar
377-
mac-arm-test:
378-
needs:
379-
- pack-natives
380-
runs-on: macos-14
381-
steps:
382-
- name: Download example tests
383-
uses: actions/download-artifact@v4
384-
with:
385-
name: example
386-
- name: Run example tests
387-
run: |
388-
java -jar example-all.jar --test
274+
# mac-arm-test:
275+
# needs:
276+
# - pack-natives
277+
# runs-on: macos-14
278+
# steps:
279+
# - name: Download example tests
280+
# uses: actions/download-artifact@v4
281+
# with:
282+
# name: example
283+
# - name: Run example tests
284+
# run: |
285+
# java -jar example-all.jar --test
389286
linux-arm-test:
390287
environment: Bitrise
391288
needs:

.github/workflows/publish-luajava-api.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build
1+
name: Build and Publish LuaJava to Github Packages
22
permissions:
33
packages: write
44

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Build and Publish Natives to Github Packages
2+
permissions:
3+
packages: write
4+
on:
5+
workflow_dispatch:
6+
push:
7+
branches: [main]
8+
tags: ["*"]
9+
10+
jobs:
11+
build-linux-windows:
12+
runs-on: ubuntu-22.04
13+
env:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
GITHUB_ACTOR: ${{ github.actor }}
16+
GITHUB_REPOSITORY: ${{ github.repository }}
17+
steps:
18+
- uses: actions/checkout@v4
19+
with:
20+
submodules: 'recursive'
21+
- name: Set up JDK 8
22+
uses: actions/setup-java@v4
23+
with:
24+
distribution: 'temurin'
25+
java-version: '8'
26+
- name: Install cross-compilation toolchains
27+
run: |
28+
sudo apt update
29+
sudo apt install -y --force-yes gcc g++ mingw-w64
30+
sudo apt install -y --force-yes gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
31+
- name: Set up Gradle
32+
uses: gradle/actions/setup-gradle@v3
33+
- name: Build natives for Linux/Windows
34+
run: |
35+
./gradlew :luajit:jnigen :luajit:jnigenBuildLinux64 :luajit:jnigenBuildWindows64
36+
./gradlew :lua54:jnigen :lua54:jnigenBuildLinux64 :lua54:jnigenBuildWindows64
37+
- name: Publish to GitHub Packages (GHCR)
38+
run: |
39+
./gradlew :luajit:publish :lua54:publish --info
40+
env:
41+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
42+
GITHUB_ACTOR: ${{ github.actor }}
43+
GITHUB_REPOSITORY: ${{ github.repository }}

android/android-test/build.gradle

Lines changed: 0 additions & 81 deletions
This file was deleted.

android/android-test/src/androidTest/java/party/iroiro/luajava/AndroidLuaTest.java

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)