Merge branch 'develop' of https://github.com/PolyMC/PolyMC into develop
This commit is contained in:
commit
6a25cacc3e
4
.github/workflows/backport.yml
vendored
4
.github/workflows/backport.yml
vendored
@ -9,7 +9,9 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v1
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
- name: Backport PR by cherry-pick-ing
|
- name: Backport PR by cherry-pick-ing
|
||||||
uses: Nathanmalnoury/gh-backport-action@master
|
uses: Nathanmalnoury/gh-backport-action@master
|
||||||
with:
|
with:
|
||||||
|
50
.github/workflows/build.yml
vendored
50
.github/workflows/build.yml
vendored
@ -19,6 +19,12 @@ jobs:
|
|||||||
qt_version: 5.12.8
|
qt_version: 5.12.8
|
||||||
qt_host: linux
|
qt_host: linux
|
||||||
|
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
name: Linux-Portable
|
||||||
|
qt_version: 5.12.8
|
||||||
|
qt_host: linux
|
||||||
|
portable: true
|
||||||
|
|
||||||
- os: ubuntu-20.04
|
- os: ubuntu-20.04
|
||||||
qt_version: 5.15.2
|
qt_version: 5.15.2
|
||||||
qt_host: linux
|
qt_host: linux
|
||||||
@ -58,7 +64,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
submodules: 'true'
|
submodules: 'true'
|
||||||
|
|
||||||
@ -91,7 +97,7 @@ jobs:
|
|||||||
- name: Cache Qt
|
- name: Cache Qt
|
||||||
if: runner.os != 'Windows'
|
if: runner.os != 'Windows'
|
||||||
id: cache-qt
|
id: cache-qt
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v3
|
||||||
with:
|
with:
|
||||||
path: "${{ github.workspace }}/Qt/"
|
path: "${{ github.workspace }}/Qt/"
|
||||||
key: ${{ runner.os }}-${{ matrix.qt_version }}-${{ matrix.qt_arch }}-qt_cache
|
key: ${{ runner.os }}-${{ matrix.qt_version }}-${{ matrix.qt_arch }}-qt_cache
|
||||||
@ -140,7 +146,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DLauncher_PORTABLE=OFF -G Ninja
|
cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DLauncher_PORTABLE=OFF -G Ninja
|
||||||
|
|
||||||
|
|
||||||
- name: Configure CMake on Windows portable
|
- name: Configure CMake on Windows portable
|
||||||
if: runner.os == 'Windows' && matrix.portable == true
|
if: runner.os == 'Windows' && matrix.portable == true
|
||||||
shell: msys2 {0}
|
shell: msys2 {0}
|
||||||
@ -148,10 +153,15 @@ jobs:
|
|||||||
cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -G Ninja
|
cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -G Ninja
|
||||||
|
|
||||||
- name: Configure CMake on Linux
|
- name: Configure CMake on Linux
|
||||||
if: runner.os == 'Linux'
|
if: runner.os == 'Linux' && matrix.portable != true
|
||||||
run: |
|
run: |
|
||||||
cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DLauncher_PORTABLE=OFF -G Ninja
|
cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DLauncher_PORTABLE=OFF -G Ninja
|
||||||
|
|
||||||
|
- name: Configure CMake on Linux Portable
|
||||||
|
if: runner.os == 'Linux' && matrix.portable == true
|
||||||
|
run: |
|
||||||
|
cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -G Ninja
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
if: runner.os != 'Windows'
|
if: runner.os != 'Windows'
|
||||||
run: |
|
run: |
|
||||||
@ -175,10 +185,15 @@ jobs:
|
|||||||
cmake --install ${{ env.BUILD_DIR }}
|
cmake --install ${{ env.BUILD_DIR }}
|
||||||
|
|
||||||
- name: Install on Linux
|
- name: Install on Linux
|
||||||
if: runner.os == 'Linux'
|
if: runner.os == 'Linux' && matrix.portable != true
|
||||||
run: |
|
run: |
|
||||||
DESTDIR=${{ env.INSTALL_DIR }} cmake --install ${{ env.BUILD_DIR }}
|
DESTDIR=${{ env.INSTALL_DIR }} cmake --install ${{ env.BUILD_DIR }}
|
||||||
|
|
||||||
|
- name: Install on Linux portable
|
||||||
|
if: runner.os == 'Linux' && matrix.portable == true
|
||||||
|
run: |
|
||||||
|
cmake --install ${{ env.BUILD_DIR }}
|
||||||
|
|
||||||
- name: Bundle AppImage
|
- name: Bundle AppImage
|
||||||
if: matrix.app_image == true
|
if: matrix.app_image == true
|
||||||
shell: bash
|
shell: bash
|
||||||
@ -219,21 +234,34 @@ jobs:
|
|||||||
tar -czf ../PolyMC.tar.gz *
|
tar -czf ../PolyMC.tar.gz *
|
||||||
|
|
||||||
- name: tar on Linux
|
- name: tar on Linux
|
||||||
if: runner.os == 'Linux' && matrix.app_image != true
|
if: runner.os == 'Linux' && matrix.app_image != true && matrix.portable != true
|
||||||
run: |
|
run: |
|
||||||
cd ${{ env.INSTALL_DIR }}
|
cd ${{ env.INSTALL_DIR }}
|
||||||
tar -czf ../PolyMC.tar.gz *
|
tar -czf ../PolyMC.tar.gz *
|
||||||
|
|
||||||
|
- name: tar on Linux portable
|
||||||
|
if: runner.os == 'Linux' && matrix.app_image != true && matrix.portable == true
|
||||||
|
run: |
|
||||||
|
cd ${{ env.INSTALL_DIR }}
|
||||||
|
tar -czf ../PolyMC-portable.tar.gz *
|
||||||
|
|
||||||
- name: Upload Linux tar.gz
|
- name: Upload Linux tar.gz
|
||||||
if: runner.os == 'Linux' && matrix.app_image != true
|
if: runner.os == 'Linux' && matrix.app_image != true && matrix.portable != true
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}
|
name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}
|
||||||
path: PolyMC.tar.gz
|
path: PolyMC.tar.gz
|
||||||
|
|
||||||
|
- name: Upload Linux Portable tar.gz
|
||||||
|
if: runner.os == 'Linux' && matrix.app_image != true && matrix.portable == true
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: PolyMC-${{ runner.os }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
|
||||||
|
path: PolyMC-portable.tar.gz
|
||||||
|
|
||||||
- name: Upload AppImage for Linux
|
- name: Upload AppImage for Linux
|
||||||
if: matrix.app_image == true
|
if: matrix.app_image == true
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
|
name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
|
||||||
path: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
|
path: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
|
||||||
@ -254,14 +282,14 @@ jobs:
|
|||||||
|
|
||||||
- name: Upload package for Windows
|
- name: Upload package for Windows
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: PolyMC-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}
|
name: PolyMC-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}
|
||||||
path: ${{ env.INSTALL_DIR }}/**
|
path: ${{ env.INSTALL_DIR }}/**
|
||||||
|
|
||||||
- name: Upload package for macOS
|
- name: Upload package for macOS
|
||||||
if: runner.os == 'macOS'
|
if: runner.os == 'macOS'
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}
|
name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}
|
||||||
path: PolyMC.tar.gz
|
path: PolyMC.tar.gz
|
||||||
|
99
.github/workflows/trigger_release.yml
vendored
99
.github/workflows/trigger_release.yml
vendored
@ -19,10 +19,36 @@ jobs:
|
|||||||
outputs:
|
outputs:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
steps:
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
submodules: 'true'
|
||||||
|
path: 'PolyMC-source'
|
||||||
|
- name: Download artifacts
|
||||||
|
uses: actions/download-artifact@v3
|
||||||
- name: Grab and store version
|
- name: Grab and store version
|
||||||
run: |
|
run: |
|
||||||
tag_name=$(echo ${{ github.ref }} | grep -oE "[^/]+$")
|
tag_name=$(echo ${{ github.ref }} | grep -oE "[^/]+$")
|
||||||
echo "VERSION=$tag_name" >> $GITHUB_ENV
|
echo "VERSION=$tag_name" >> $GITHUB_ENV
|
||||||
|
- name: Package artifacts properly
|
||||||
|
run: |
|
||||||
|
mv ${{ github.workspace }}/PolyMC-source PolyMC-${{ env.VERSION }}
|
||||||
|
mv PolyMC-Linux*/PolyMC.tar.gz PolyMC-Linux-${{ env.VERSION }}.tar.gz
|
||||||
|
mv PolyMC-*.AppImage/PolyMC-*.AppImage PolyMC-Linux-${{ env.VERSION }}-x86_64.AppImage
|
||||||
|
mv PolyMC-macOS*/PolyMC.tar.gz PolyMC-macOS-${{ env.VERSION }}.tar.gz
|
||||||
|
|
||||||
|
tar -czf PolyMC-${{ env.VERSION }}.tar.gz PolyMC-${{ env.VERSION }}
|
||||||
|
|
||||||
|
for d in PolyMC-Windows-*; do
|
||||||
|
cd "${d}" || continue
|
||||||
|
ARCH="$(echo -n ${d} | cut -d '-' -f 3)"
|
||||||
|
PORT="$(echo -n ${d} | grep -o portable || true)"
|
||||||
|
NAME="PolyMC-Windows-${ARCH}"
|
||||||
|
test -z "${PORT}" || NAME="${NAME}-portable"
|
||||||
|
zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" *
|
||||||
|
cd ..
|
||||||
|
done
|
||||||
|
|
||||||
- name: Create release
|
- name: Create release
|
||||||
id: create_release
|
id: create_release
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
@ -33,67 +59,12 @@ jobs:
|
|||||||
name: PolyMC ${{ env.VERSION }}
|
name: PolyMC ${{ env.VERSION }}
|
||||||
draft: true
|
draft: true
|
||||||
prerelease: false
|
prerelease: false
|
||||||
|
files: |
|
||||||
upload_release:
|
PolyMC-Linux-${{ env.VERSION }}.tar.gz
|
||||||
needs: create_release
|
PolyMC-Linux-${{ env.VERSION }}-x86_64.AppImage
|
||||||
runs-on: ubuntu-latest
|
PolyMC-Windows-i686-${{ env.VERSION }}.zip
|
||||||
steps:
|
PolyMC-Windows-i686-portable-${{ env.VERSION }}.zip
|
||||||
|
PolyMC-Windows-x86_64-${{ env.VERSION }}.zip
|
||||||
- name: Download artifacts
|
PolyMC-Windows-x86_64-portable-${{ env.VERSION }}.zip
|
||||||
uses: actions/download-artifact@v2
|
PolyMC-macOS-${{ env.VERSION }}.tar.gz
|
||||||
|
PolyMC-${{ env.VERSION }}.tar.gz
|
||||||
- name: Grab and store version
|
|
||||||
run: |
|
|
||||||
tag_name=$(echo ${{ github.ref }} | grep -oE "[^/]+$")
|
|
||||||
echo "VERSION=$tag_name" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Package artifacts properly
|
|
||||||
run: |
|
|
||||||
mv PolyMC-Linux*/PolyMC.tar.gz PolyMC-Linux-${{ env.VERSION }}.tar.gz
|
|
||||||
mv PolyMC-*.AppImage/PolyMC-*.AppImage PolyMC-Linux-${{ env.VERSION }}-x86_64.AppImage
|
|
||||||
mv PolyMC-Windows* PolyMC-Windows-${{ env.VERSION }}
|
|
||||||
mv PolyMC-macOS*/PolyMC.tar.gz PolyMC-macOS-${{ env.VERSION }}.tar.gz
|
|
||||||
|
|
||||||
cd PolyMC-Windows-${{ env.VERSION }}
|
|
||||||
zip -r -9 ../PolyMC-Windows-${{ env.VERSION }}.zip *
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
- name: Upload Linux asset
|
|
||||||
uses: actions/upload-release-asset@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
upload_url: ${{ needs.create_release.outputs.upload_url }}
|
|
||||||
asset_name: PolyMC-Linux-${{ env.VERSION }}.tar.gz
|
|
||||||
asset_path: PolyMC-Linux-${{ env.VERSION }}.tar.gz
|
|
||||||
asset_content_type: application/gzip
|
|
||||||
|
|
||||||
- name: Upload Linux AppImage asset
|
|
||||||
uses: actions/upload-release-asset@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
upload_url: ${{ needs.create_release.outputs.upload_url }}
|
|
||||||
asset_name: PolyMC-Linux-${{ env.VERSION }}-x86_64.AppImage
|
|
||||||
asset_path: PolyMC-Linux-${{ env.VERSION }}-x86_64.AppImage
|
|
||||||
asset_content_type: application/x-executable
|
|
||||||
|
|
||||||
- name: Upload Windows asset
|
|
||||||
uses: actions/upload-release-asset@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
upload_url: ${{ needs.create_release.outputs.upload_url }}
|
|
||||||
asset_name: PolyMC-Windows-${{ env.VERSION }}.zip
|
|
||||||
asset_path: PolyMC-Windows-${{ env.VERSION }}.zip
|
|
||||||
asset_content_type: application/zip
|
|
||||||
|
|
||||||
- name: Upload macOS asset
|
|
||||||
uses: actions/upload-release-asset@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
upload_url: ${{ needs.create_release.outputs.upload_url }}
|
|
||||||
asset_name: PolyMC-macOS-${{ env.VERSION }}.tar.gz
|
|
||||||
asset_path: PolyMC-macOS-${{ env.VERSION }}.tar.gz
|
|
||||||
asset_content_type: application/gzip
|
|
||||||
|
@ -53,7 +53,7 @@ set(Launcher_HELP_URL "https://polymc.org/wiki/%1" CACHE STRING "URL (with arg %
|
|||||||
######## Set version numbers ########
|
######## Set version numbers ########
|
||||||
set(Launcher_VERSION_MAJOR 1)
|
set(Launcher_VERSION_MAJOR 1)
|
||||||
set(Launcher_VERSION_MINOR 1)
|
set(Launcher_VERSION_MINOR 1)
|
||||||
set(Launcher_VERSION_HOTFIX 0)
|
set(Launcher_VERSION_HOTFIX 1)
|
||||||
|
|
||||||
# Build number
|
# Build number
|
||||||
set(Launcher_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
|
set(Launcher_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
|
||||||
|
@ -55,7 +55,8 @@ void Modrinth::loadIndexedPackVersions(Modrinth::IndexedPack & pack, QJsonArray
|
|||||||
// Find correct file (needed in cases where one version may have multiple files)
|
// Find correct file (needed in cases where one version may have multiple files)
|
||||||
// Will default to the last one if there's no primary (though I think Modrinth requires that
|
// Will default to the last one if there's no primary (though I think Modrinth requires that
|
||||||
// at least one file is primary, idk)
|
// at least one file is primary, idk)
|
||||||
while (i < files.count()){
|
// NOTE: files.count() is 1-indexed, so we need to subtract 1 to become 0-indexed
|
||||||
|
while (i < files.count() - 1){
|
||||||
auto parent = files[i].toObject();
|
auto parent = files[i].toObject();
|
||||||
auto fileName = Json::requireString(parent, "filename");
|
auto fileName = Json::requireString(parent, "filename");
|
||||||
|
|
||||||
@ -77,6 +78,7 @@ void Modrinth::loadIndexedPackVersions(Modrinth::IndexedPack & pack, QJsonArray
|
|||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
auto parent = files[i].toObject();
|
auto parent = files[i].toObject();
|
||||||
if(parent.contains("url")) {
|
if(parent.contains("url")) {
|
||||||
file.downloadUrl = Json::requireString(parent, "url");
|
file.downloadUrl = Json::requireString(parent, "url");
|
||||||
|
Loading…
Reference in New Issue
Block a user