Merge branch 'Chatterino:master' into chatterino7

.github/workflows/build.yml

@@ -111,7 +111,7 @@ jobs:
         with:
           cache: true
           cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2
-          modules: qt5compat
+          modules: qt5compat qtimageformats
           version: ${{ matrix.qt-version }}
 
       # WINDOWS
@@ -342,15 +342,15 @@ jobs:
           fetch-depth: 0 # allows for tags access
 
       - uses: actions/download-artifact@v3
-        name: Windows Qt5.15.2
+        name: macOS x86_64 Qt6.5.0 dmg
         with:
-          name: chatterino-windows-x86-64-Qt-5.15.2.zip
+          name: chatterino-macos-Qt-6.5.0.dmg
           path: release-artifacts/
 
       - uses: actions/download-artifact@v3
-        name: Windows Qt5.15 symbols
+        name: Ubuntu 22.04 Qt6.2.4 deb
         with:
-          name: chatterino-windows-x86-64-Qt-5.15.2-symbols.pdb.7z
+          name: Chatterino-ubuntu-22.04-Qt-6.2.4.deb
           path: release-artifacts/
 
       - uses: actions/download-artifact@v3
@@ -365,41 +365,46 @@ jobs:
           name: chatterino-windows-x86-64-Qt-6.5.0-symbols.pdb.7z
           path: release-artifacts/
 
+      - name: Mark experimental
+        run: |
+          ls -l
+          # Mark all Qt6 builds as EXPERIMENTAL
+          mv chatterino-macos-Qt-6.5.0.dmg EXPERIMENTAL-chatterino-macos-Qt-6.5.0-dmg
+          mv Chatterino-ubuntu-22.04-x86_64.deb EXPERIMENTAL-Chatterino-ubuntu-22.04-Qt-6.2.4.deb
+          mv chatterino-windows-x86-64-Qt-6.5.0.zip EXPERIMENTAL-chatterino-windows-x86-64-Qt-6.5.0.zip
+          mv chatterino-Qt-6.5.0.pdb.7z EXPERIMENTAL-chatterino-Qt-6.5.0.pdb.7z
+        working-directory: release-artifacts
+        shell: bash
+
       - uses: actions/download-artifact@v3
-        name: Ubuntu 22.04 Qt5.15.2 deb
+        name: Windows Qt5.15.2
         with:
-          name: Chatterino-ubuntu-22.04-Qt-5.15.2.deb
+          name: chatterino-windows-x86-64-Qt-5.15.2.zip
           path: release-artifacts/
 
       - uses: actions/download-artifact@v3
-        name: Ubuntu 22.04 Qt6.2.4 deb
+        name: Windows Qt5.15 symbols
         with:
-          name: Chatterino-ubuntu-22.04-Qt-6.2.4.deb
+          name: chatterino-windows-x86-64-Qt-5.15.2-symbols.pdb.7z
           path: release-artifacts/
 
       - uses: actions/download-artifact@v3
-        name: macOS x86_64 Qt5.15.2 dmg
+        name: Ubuntu 22.04 Qt5.15.2 deb
         with:
-          name: chatterino-macos-Qt-5.15.2.dmg
+          name: Chatterino-ubuntu-22.04-Qt-5.15.2.deb
           path: release-artifacts/
 
       - uses: actions/download-artifact@v3
-        name: macOS x86_64 Qt6.5.0 dmg
+        name: macOS x86_64 Qt5.15.2 dmg
         with:
-          name: chatterino-macos-Qt-6.5.0.dmg
+          name: chatterino-macos-Qt-5.15.2.dmg
           path: release-artifacts/
 
       - name: Copy flatpakref
         run: |
           cp .CI/chatterino-nightly.flatpakref release-artifacts/
         shell: bash
 
-      - name: Mark experimental
-        run: |
-          for file in *; do mv -n "$file" "$(echo $file | sed 's/\(6\(\.[[:digit:]]\)\{2\}\)/\1-EXPERIMENTAL/g')"; done
-        working-directory: release-artifacts
-        shell: bash
-
       - name: Create release
         uses: ncipollo/release-action@v1.12.0
         with:

CHANGELOG.md

@@ -35,7 +35,7 @@
 - Dev: Add scripting capabilities with Lua (#4341, #4504)
 - Dev: Conan 2.0 is now used instead of Conan 1.0. (#4417)
 - Dev: Added tests and benchmarks for `LinkParser`. (#4436)
-- Dev: Experimental builds with Qt 6 are now provided. (#4522)
+- Dev: Experimental builds with Qt 6 are now provided. (#4522, #4551, #4553, #4554, #4555, #4556)
 - Dev: Removed `CHATTERINO_TEST` definitions. (#4526)
 - Dev: Builds for macOS now have `macos` in their name (previously: `osx`). (#4550)