From 421497c6cb6af421a668e82817716fc2481a6bb7 Mon Sep 17 00:00:00 2001 From: pajlada Date: Mon, 17 Apr 2023 09:59:25 +0200 Subject: [PATCH] Mark builds as experimental (#4553) --- .github/workflows/build.yml | 53 ++++++++++++++++++++----------------- CHANGELOG.md | 2 +- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 957a29a62..f27a70f45 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -361,15 +361,16 @@ 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 + Chatterino-ubuntu-22.04-Qt-6.2.4.deb path: release-artifacts/ - uses: actions/download-artifact@v3 @@ -384,6 +385,29 @@ 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-windows-x86-64-Qt-6.5.0-symbols.pdb.7z EXPERIMENTAL-chatterino-windows-x86-64-Qt-6.5.0-symbols.pdb.7z + working-directory: release-artifacts + shell: bash + + - uses: actions/download-artifact@v3 + name: Windows Qt5.15.2 + with: + name: chatterino-windows-x86-64-Qt-5.15.2.zip + path: release-artifacts/ + + - uses: actions/download-artifact@v3 + name: Windows Qt5.15 symbols + with: + name: chatterino-windows-x86-64-Qt-5.15.2-symbols.pdb.7z + path: release-artifacts/ + - uses: actions/download-artifact@v3 name: Linux Qt5.12.12 AppImage with: @@ -402,38 +426,17 @@ jobs: name: Chatterino-ubuntu-22.04-Qt-5.15.2.deb path: release-artifacts/ - - uses: actions/download-artifact@v3 - name: Ubuntu 22.04 Qt6.2.4 deb - with: - name: Chatterino-ubuntu-22.04-Qt-6.2.4.deb - path: release-artifacts/ - - uses: actions/download-artifact@v3 name: macOS x86_64 Qt5.15.2 dmg with: name: chatterino-macos-Qt-5.15.2.dmg path: release-artifacts/ - - uses: actions/download-artifact@v3 - name: macOS x86_64 Qt6.5.0 dmg - with: - name: chatterino-macos-Qt-6.5.0.dmg - path: release-artifacts/ - - name: Copy flatpakref run: | cp .CI/chatterino-nightly.flatpakref release-artifacts/ shell: bash - - name: Mark experimental - run: | - # 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-Qt-6.2.4.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 - working-directory: release-artifacts - shell: bash - - name: Create release uses: ncipollo/release-action@v1.12.0 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 646974bac..a74906baf 100644 --- a/CHANGELOG.md +++ b/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, #4551) +- Dev: Experimental builds with Qt 6 are now provided. (#4522, #4551, #4553) - Dev: Removed `CHATTERINO_TEST` definitions. (#4526) - Dev: Builds for macOS now have `macos` in their name (previously: `osx`). (#4550)