Implement even more PR suggestions
This commit is contained in:
parent
9497485103
commit
0ba61bb590
38
.github/scripts/prepare_JREs.sh
vendored
38
.github/scripts/prepare_JREs.sh
vendored
@ -13,33 +13,25 @@ for file in *;
|
|||||||
do
|
do
|
||||||
mkdir temp
|
mkdir temp
|
||||||
|
|
||||||
# Handle OpenJDK17 archive
|
re='(OpenJDK([[:digit:]]+)U-jre_x64_linux_hotspot_([[:digit:]]+)(.*).tar.gz)'
|
||||||
re='(OpenJDK17U-jre_x64_linux_hotspot_17.(.*).tar.gz)'
|
|
||||||
if [[ $file =~ $re ]];
|
if [[ $file =~ $re ]];
|
||||||
then
|
then
|
||||||
version=${BASH_REMATCH[2]}
|
version_major=${BASH_REMATCH[2]}
|
||||||
version_edit=$(echo $version | sed -e 's/_/+/g')
|
version_trailing=${BASH_REMATCH[4]}
|
||||||
dir_name=jdk-17.$version_edit-jre
|
|
||||||
echo $dir_name
|
if [ $version_major = 17 ];
|
||||||
mkdir jre17
|
then
|
||||||
|
hyphen='-'
|
||||||
|
else
|
||||||
|
hyphen=''
|
||||||
|
fi
|
||||||
|
|
||||||
|
version_edit=$(echo $version_trailing | sed -e 's/_/+/g' | sed -e 's/b/-b/g')
|
||||||
|
dir_name=jdk$hyphen$version_major$version_edit-jre
|
||||||
|
mkdir jre$version_major
|
||||||
tar -xzf $file -C temp
|
tar -xzf $file -C temp
|
||||||
pushd temp/$dir_name
|
pushd temp/$dir_name
|
||||||
cp -r . ../../jre17
|
cp -r . ../../jre$version_major
|
||||||
popd
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Handle OpenJDK8 archive
|
|
||||||
re='(OpenJDK8U-jre_x64_linux_hotspot_8(.*).tar.gz)'
|
|
||||||
if [[ $file =~ $re ]];
|
|
||||||
then
|
|
||||||
version=${BASH_REMATCH[2]}
|
|
||||||
version_edit=$(echo $version | sed -e 's/b/-b/g')
|
|
||||||
dir_name=jdk8$version_edit-jre
|
|
||||||
mkdir jre8
|
|
||||||
tar -xzf $file -C temp
|
|
||||||
pushd temp/$dir_name
|
|
||||||
cp -r . ../../jre8
|
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -124,7 +124,7 @@ jobs:
|
|||||||
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_DIR }}/usr/lib/jvm/java-17-openjdk/lib/server"
|
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_DIR }}/usr/lib/jvm/java-17-openjdk/lib/server"
|
||||||
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_DIR }}/usr/lib/jvm/java-17-openjdk/lib"
|
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ 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
|
./linuxdeploy-x86_64.AppImage --appdir ${{ env.INSTALL_DIR }} --output appimage --plugin qt -i ${{ env.INSTALL_DIR }}/usr/share/icons/hicolor/scalable/apps/org.polymc.PolyMC.svg
|
||||||
|
|
||||||
- name: Run windeployqt
|
- name: Run windeployqt
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
|
@ -100,6 +100,11 @@ sudo dnf install polymc
|
|||||||
|
|
||||||
MacOS currently does not have any packages. We are still working on setting up MacOS packaging. Meanwhile, you can [build](https://github.com/PolyMC/PolyMC/blob/develop/BUILD.md#macos) it for yourself.
|
MacOS currently does not have any packages. We are still working on setting up MacOS packaging. Meanwhile, you can [build](https://github.com/PolyMC/PolyMC/blob/develop/BUILD.md#macos) it for yourself.
|
||||||
|
|
||||||
|
## Development Builds
|
||||||
|
|
||||||
|
There are per-commit development builds available [here](https://github.com/PolyMC/PolyMC/actions). These have debug information in the binaries, so their file sizes are relatively larger.
|
||||||
|
Builds are provided for Linux, AppImage on Linux, Windows, and macOS.
|
||||||
|
|
||||||
# Help & Support
|
# Help & Support
|
||||||
|
|
||||||
Feel free to create an issue if you need help. However, you might find it easier to ask in the Discord server.
|
Feel free to create an issue if you need help. However, you might find it easier to ask in the Discord server.
|
||||||
|
Loading…
Reference in New Issue
Block a user