diff options
| author | txtsd <thexerothermicsclerodermoid@gmail.com> | 2022-02-07 15:48:47 +0530 |
|---|---|---|
| committer | txtsd <thexerothermicsclerodermoid@gmail.com> | 2022-02-11 18:05:26 +0530 |
| commit | e61e827eb93c71f3b0fe1e7e07b5ca4887587532 (patch) | |
| tree | 86408c419d2f8997ee7e9ec4d24457124787937a /.github/workflows/build.yml | |
| parent | 92a5b12bd9890eab3d5f6a9aa2fb24912a79ddf9 (diff) | |
| download | PrismLauncher-e61e827eb93c71f3b0fe1e7e07b5ca4887587532.tar.gz PrismLauncher-e61e827eb93c71f3b0fe1e7e07b5ca4887587532.tar.bz2 PrismLauncher-e61e827eb93c71f3b0fe1e7e07b5ca4887587532.zip | |
Use Adoptium JREs
Diffstat (limited to '.github/workflows/build.yml')
| -rw-r--r-- | .github/workflows/build.yml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f19da8d9..d2973b0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,11 +46,6 @@ jobs: - name: Install OpenJDK uses: AdoptOpenJDK/install-jdk@v1 with: - version: '8' - - - name: Install OpenJDK - uses: AdoptOpenJDK/install-jdk@v1 - with: version: '17' - name: Cache Qt @@ -103,6 +98,12 @@ jobs: wget "https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage" wget "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage" + - name: Download JREs for AppImage + if: matrix.app_image == true + shell: bash + run: | + ${{ github.workspace }}/.github/scripts/prepare_JREs.sh + - name: AppImage magic if: matrix.app_image == true shell: bash @@ -110,8 +111,8 @@ jobs: export OUTPUT="PolyMC-${{ github.sha }}-x86_64.AppImage" chmod +x linuxdeploy-*.AppImage mkdir -p ${{ env.INSTALL_DIR }}/usr/lib/jvm/java-{8,17}-openjdk - cp -r /opt/hostedtoolcache/jdk-8-hotspot/1.0.0/x64/* ${{ env.INSTALL_DIR }}/usr/lib/jvm/java-8-openjdk - cp -r /opt/hostedtoolcache/jdk-17-hotspot/1.0.0/x64/* ${{ env.INSTALL_DIR }}/usr/lib/jvm/java-17-openjdk + cp -r ${{ github.workspace }}/JREs/jre8/* ${{ env.INSTALL_DIR }}/usr/lib/jvm/java-8-openjdk + cp -r ${{ github.workspace }}/JREs/jre17/* ${{ env.INSTALL_DIR }}/usr/lib/jvm/java-17-openjdk LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_DIR }}/usr/lib:${{ env.INSTALL_DIR }}/usr/lib/jvm/java-8-openjdk/jre/lib/amd64/server:${{ env.INSTALL_DIR }}/usr/lib/jvm/java-8-openjdk/jre/lib/amd64:${{ env.INSTALL_DIR }}/usr/lib/jvm/java-17-openjdk/lib/server:${{ env.INSTALL_DIR }}/usr/lib/jvm/java-17-openjdk/lib" \ ./linuxdeploy-x86_64.AppImage --appdir ${{ env.INSTALL_DIR }} --output appimage --plugin qt -d ${{ env.INSTALL_DIR }}/usr/share/applications/org.polymc.polymc.desktop -i ${{ env.INSTALL_DIR }}/usr/share/icons/hicolor/scalable/apps/org.polymc.PolyMC.svg |