@@ -17,11 +17,12 @@ jobs:
1717 - uses : actions/checkout@v4
1818 with :
1919 submodules : ' recursive'
20- - name : Set up JDK 8
20+ - name : Set up JDK 17
2121 uses : actions/setup-java@v4
2222 with :
2323 distribution : ' temurin'
24- java-version : ' 8'
24+ java-version : ' 17'
25+ - run : echo "JAVA_17=$JAVA_HOME" >> $GITHUB_ENV
2526 - name : Install cross-compilation toolchains
2627 run : |
2728 sudo apt update
@@ -37,41 +38,36 @@ jobs:
3738 uses : actions/upload-artifact@v4
3839 with :
3940 name : linux-windows-natives
40- path : |
41- **/libs/
41+ path : ./*/libs
4242 retention-days : 1
4343
44- build-macos :
45- runs-on : macos-latest
46- env :
47- GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
48- GITHUB_ACTOR : ${{ github.actor }}
49- GITHUB_REPOSITORY : ${{ github.repository }}
44+ apple-natives :
45+ runs-on : macos-13
5046 steps :
5147 - uses : actions/checkout@v4
5248 with :
53- submodules : ' recursive'
54- - name : Set up JDK 11
49+ submodules : " recursive"
50+ - name : Set up JDK 17
5551 uses : actions/setup-java@v4
5652 with :
57- distribution : ' temurin'
58- java-version : ' 11'
53+ distribution : " temurin"
54+ java-version : " 17"
55+ - run : echo "JAVA_17=$JAVA_HOME" >> $GITHUB_ENV
5956 - name : Set up Gradle
6057 uses : gradle/actions/setup-gradle@v3
61- - name : Build natives for macOS
58+ - name : Build natives
6259 run : |
6360 ./gradlew :luajit:jnigen :luajit:jnigenBuildMacOsX64 :luajit:jnigenBuildMacOsXARM64
6461 ./gradlew :lua54:jnigen :lua54:jnigenBuildMacOsX64 :lua54:jnigenBuildMacOsXARM64
65- - name : Upload macOS artifacts
62+ - name : Upload macOS natives
6663 uses : actions/upload-artifact@v4
6764 with :
68- name : macos-natives
69- path : |
70- **/libs/
65+ name : apple-natives
66+ path : ./*/libs
7167 retention-days : 1
7268
7369 publish :
74- needs : [build-linux-windows, build-macos ]
70+ needs : [build-linux-windows, apple-natives ]
7571 runs-on : ubuntu-22.04
7672 env :
7773 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
@@ -81,19 +77,17 @@ jobs:
8177 - uses : actions/checkout@v4
8278 with :
8379 submodules : ' recursive'
84- - name : Set up JDK 11
80+ - name : Set up JDK 17
8581 uses : actions/setup-java@v4
8682 with :
8783 distribution : ' temurin'
88- java-version : ' 11'
89- - name : Download Linux/Windows artifacts
90- uses : actions/download-artifact@v4
91- with :
92- name : linux-windows-natives
93- - name : Download macOS artifacts
84+ java-version : ' 17'
85+ - run : echo "JAVA_17=$JAVA_HOME" >> $GITHUB_ENV
86+ - name : Download all artifacts
9487 uses : actions/download-artifact@v4
9588 with :
96- name : macos-natives
89+ pattern : ' *-natives'
90+ merge-multiple : true
9791 - name : Set up Gradle
9892 uses : gradle/actions/setup-gradle@v3
9993 - name : Publish to GitHub Packages (GHCR)
0 commit comments