feat(actions): package and deliver qt6 tarballs

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>

2 files changed, 32 insertions, 15 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1108fed6..30c02301 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,10 +23,9 @@ jobs:
             qt_ver: 5
 
           - os: ubuntu-20.04
-            appimage: true
             qt_ver: 6
             qt_host: linux
-            qt_version: '6.3.1'
+            qt_version: '6.2.4'
             qt_modules: 'qt5compat qtimageformats'
             qt_path: /home/runner/work/PolyMC/Qt
 
@@ -92,7 +91,7 @@ jobs:
         if: runner.os != 'Windows' && inputs.build_type == 'Debug'
         uses: hendrikmuhs/ccache-action@v1.2.1
         with:
-          key: ${{ matrix.os }}-${{ matrix.appimage }}
+          key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}
 
       - name: Setup ccache (Windows)
         if: runner.os == 'Windows' && inputs.build_type == 'Debug'
@@ -115,9 +114,9 @@ jobs:
         uses: actions/cache@v3.0.2
         with:
           path: '${{ github.workspace }}\.ccache'
-          key: ${{ matrix.os }}--qt${{ matrix.qt_ver }}
+          key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}
           restore-keys: |
-              ${{ matrix.os }}--qt${{ matrix.qt_ver }}
+              ${{ matrix.os }}-qt${{ matrix.qt_ver }}
 
       - name: Set short version
         shell: bash
@@ -138,7 +137,7 @@ jobs:
           brew install ninja extra-cmake-modules
 
       - name: Install Qt (Linux)
-        if: runner.os == 'Linux' && matrix.appimage != true
+        if: runner.os == 'Linux' && matrix.qt_ver != 6
         run: |
           sudo apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5
  
@@ -162,7 +161,7 @@ jobs:
            aqtversion: ==2.1.*
 
       - name: Prepare AppImage (Linux)
-        if: runner.os == 'Linux' && matrix.appimage == true
+        if: runner.os == 'Linux' && matrix.qt_ver != 5
         run: |
           wget "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
           wget "https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage"
@@ -281,7 +280,7 @@ jobs:
           makensis -NOCD "${{ github.workspace }}/${{ env.BUILD_DIR }}/program_info/win_install.nsi"
 
       - name: Package (Linux)
-        if: runner.os == 'Linux' && matrix.appimage != true
+        if: runner.os == 'Linux'
         run: |
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_DIR }}
 
@@ -289,7 +288,7 @@ jobs:
           tar --owner root --group root -czf ../PolyMC.tar.gz *
 
       - name: Package (Linux, portable)
-        if: runner.os == 'Linux' && matrix.appimage != true
+        if: runner.os == 'Linux'
         run: |
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }}
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable
@@ -298,7 +297,7 @@ jobs:
           tar -czf ../PolyMC-portable.tar.gz *
 
       - name: Package AppImage (Linux)
-        if: runner.os == 'Linux' && matrix.appimage == true
+        if: runner.os == 'Linux' && matrix.qt_ver != 5
         shell: bash
         run: |
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_APPIMAGE_DIR }}/usr
@@ -357,22 +356,36 @@ jobs:
           name: PolyMC-${{ matrix.name }}-Setup-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PolyMC-Setup.exe
 
-      - name: Upload binary tarball (Linux)
-        if: runner.os == 'Linux' && matrix.appimage != true
+      - name: Upload binary tarball (Linux, Qt 5)
+        if: runner.os == 'Linux' && matrix.qt_ver != 6
         uses: actions/upload-artifact@v3
         with:
           name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PolyMC.tar.gz
 
-      - name: Upload binary tarball (Linux, portable)
-        if: runner.os == 'Linux' && matrix.appimage != true
+      - name: Upload binary tarball (Linux, portable, Qt 5)
+        if: runner.os == 'Linux' && matrix.qt_ver != 6
         uses: actions/upload-artifact@v3
         with:
           name: PolyMC-${{ runner.os }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PolyMC-portable.tar.gz
 
+      - name: Upload binary tarball (Linux, Qt 6)
+        if: runner.os == 'Linux' && matrix.qt_ver !=5
+        uses: actions/upload-artifact@v3
+        with:
+          name: PolyMC-${{ runner.os }}-qt6-${{ env.VERSION }}-${{ inputs.build_type }}
+          path: PolyMC.tar.gz
+
+      - name: Upload binary tarball (Linux, portable, Qt 6)
+        if: runner.os == 'Linux' && matrix.qt_ver != 5
+        uses: actions/upload-artifact@v3
+        with:
+          name: PolyMC-${{ runner.os }}-Portable-qt6-${{ env.VERSION }}-${{ inputs.build_type }}
+          path: PolyMC-portable.tar.gz
+
       - name: Upload AppImage (Linux)
-        if: runner.os == 'Linux' && matrix.appimage == true
+        if: runner.os == 'Linux' && matrix.qt_ver != 5
         uses: actions/upload-artifact@v3
         with:
           name: PolyMC-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
index af4a5f03..2334828e 100644
--- a/.github/workflows/trigger_release.yml
+++ b/.github/workflows/trigger_release.yml
@@ -35,6 +35,8 @@ jobs:
       - name: Package artifacts properly
         run: |
           mv ${{ github.workspace }}/PolyMC-source PolyMC-${{ env.VERSION }}
+          mv PolyMC-Linux-Portable-qt6*/PolyMC-portable.tar.gz PolyMC-Linux-Portable-qt6-${{ env.VERSION }}.tar.gz
+          mv PolyMC-Linux-qt6*/PolyMC.tar.gz PolyMC-Linux-qt6-${{ env.VERSION }}.tar.gz          
           mv PolyMC-Linux-Portable*/PolyMC-portable.tar.gz PolyMC-Linux-Portable-${{ env.VERSION }}.tar.gz
           mv PolyMC-Linux*/PolyMC.tar.gz PolyMC-Linux-${{ env.VERSION }}.tar.gz
           mv PolyMC-*.AppImage/PolyMC-*.AppImage PolyMC-Linux-${{ env.VERSION }}-x86_64.AppImage
@@ -70,6 +72,8 @@ jobs:
             PolyMC-Linux-Portable-${{ env.VERSION }}.tar.gz
             PolyMC-Linux-${{ env.VERSION }}-x86_64.AppImage
             PolyMC-Windows-Legacy-${{ env.VERSION }}.zip
+            PolyMC-Linux-qt6-${{ env.VERSION }}.tar.gz
+            PolyMC-Linux-Portable-qt6-${{ env.VERSION }}.tar.gz
             PolyMC-Windows-Legacy-Portable-${{ env.VERSION }}.zip
             PolyMC-Windows-Legacy-Setup-${{ env.VERSION }}.exe
             PolyMC-Windows-${{ env.VERSION }}.zip