From 62363e6ee04d857722072168cdfccd9482d053a3 Mon Sep 17 00:00:00 2001 From: ExplosBlue Date: Thu, 6 Aug 2026 17:02:24 +0100 Subject: [PATCH 1/5] Update CI --- .github/workflows/BuildAndRelease.yml | 37 +++++++++++---------------- CoinKiller.pro | 6 +++++ 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.github/workflows/BuildAndRelease.yml b/.github/workflows/BuildAndRelease.yml index 70dfee5..52c6549 100644 --- a/.github/workflows/BuildAndRelease.yml +++ b/.github/workflows/BuildAndRelease.yml @@ -8,7 +8,7 @@ on: env: SOURCE_DIR: ${{ github.workspace }} - QT_VERSION: 6.2 + QT_VERSION: 6.10.2 permissions: contents: write @@ -41,21 +41,16 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: - version: ${{ env.QT_VERSION }} - host: windows - target: desktop - arch: win64_msvc2019_64 - dir: ${{ runner.temp }} - cache: 'true' - cache-key-prefix: 'install-qt-action-win' - setup-python: false + version: ${{ env.QT_VERSION }} + arch: win64_msvc2022_64 + cache: true - name: Download JOM uses: suisei-cn/actions-download-file@v1.4.0 @@ -107,20 +102,16 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: - version: ${{ env.QT_VERSION }} - host: mac - target: desktop - arch: clang_64 - dir: ${{ runner.temp }} - cache: 'true' - cache-key-prefix: 'install-qt-action-macos' + version: ${{ env.QT_VERSION }} + arch: clang_64 + cache: true - name: Setup xcode uses: maxim-lobanov/setup-xcode@v1 @@ -156,7 +147,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive @@ -193,6 +184,8 @@ jobs: - name: Deploy working-directory: ${{ runner.temp }} + env: + APPIMAGE_EXTRACT_AND_RUN: "1" run: | ./linuxdeploy-x86_64.AppImage --appdir ${{ runner.temp }}/build/AppDir --plugin qt --output appimage @@ -239,7 +232,7 @@ jobs: mv ${{ runner.temp }}/CoinKiller-Linux/CoinKiller-x86_64.AppImage ${{ runner.temp }}/CoinKiller-Linux/CoinKiller-Linux-x86_64-${{ needs.setup-env.outputs.timestamp }}.AppImage - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: tag_name: Automated-${{ needs.setup-env.outputs.timestamp }} generate_release_notes: true diff --git a/CoinKiller.pro b/CoinKiller.pro index 8dcc3d3..ddf5eff 100644 --- a/CoinKiller.pro +++ b/CoinKiller.pro @@ -183,4 +183,10 @@ TRANSLATIONS += \ CONFIG += c++23 +msvc { + QMAKE_CXXFLAGS += /std:c++latest +} else { + QMAKE_CXXFLAGS += -std=c++23 +} + INCLUDEPATH += third_party/ExETC1 From 2a81456bf732d1fe8f6173a0bf29aefdf4cbf062 Mon Sep 17 00:00:00 2001 From: ExplosBlue Date: Fri, 7 Aug 2026 01:10:39 +0100 Subject: [PATCH 2/5] Update CI --- .github/workflows/BuildAndRelease.yml | 4 ++-- third_party/ExETC1 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/BuildAndRelease.yml b/.github/workflows/BuildAndRelease.yml index 52c6549..0d92995 100644 --- a/.github/workflows/BuildAndRelease.yml +++ b/.github/workflows/BuildAndRelease.yml @@ -123,7 +123,7 @@ jobs: run: | mkdir build cd build - qmake ${{ env.SOURCE_DIR }}/CoinKiller.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64" CK_VERSION=${{ needs.setup-env.outputs.ck-version }} + qmake ${{ env.SOURCE_DIR }}/CoinKiller.pro QMAKE_APPLE_DEVICE_ARCHS="arm64" CK_VERSION=${{ needs.setup-env.outputs.ck-version }} make -j1 - name: Deploy @@ -228,7 +228,7 @@ jobs: - name: Rename output Files run: | - mv ${{ runner.temp }}/CoinKiller-Macos/CoinKiller.dmg ${{ runner.temp }}/CoinKiller-Macos/CoinKiller-MacOS-Universal-${{ needs.setup-env.outputs.timestamp }}.dmg + mv ${{ runner.temp }}/CoinKiller-Macos/CoinKiller.dmg ${{ runner.temp }}/CoinKiller-Macos/CoinKiller-MacOS-arm64-${{ needs.setup-env.outputs.timestamp }}.dmg mv ${{ runner.temp }}/CoinKiller-Linux/CoinKiller-x86_64.AppImage ${{ runner.temp }}/CoinKiller-Linux/CoinKiller-Linux-x86_64-${{ needs.setup-env.outputs.timestamp }}.AppImage - name: Release diff --git a/third_party/ExETC1 b/third_party/ExETC1 index 82c8f6c..fc550bf 160000 --- a/third_party/ExETC1 +++ b/third_party/ExETC1 @@ -1 +1 @@ -Subproject commit 82c8f6c51acc2dc6d8b20ef98ccb22801ae42070 +Subproject commit fc550bfd3f2cf4a4ef6c4e3a8de5364d97bf3987 From 1dfdb2c84c506536e80a5d0b33f3ee1f38efd11c Mon Sep 17 00:00:00 2001 From: ExplosBlue Date: Fri, 7 Aug 2026 01:18:44 +0100 Subject: [PATCH 3/5] Update CI --- .github/workflows/BuildAndRelease.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/BuildAndRelease.yml b/.github/workflows/BuildAndRelease.yml index 0d92995..0134ca0 100644 --- a/.github/workflows/BuildAndRelease.yml +++ b/.github/workflows/BuildAndRelease.yml @@ -113,11 +113,6 @@ jobs: arch: clang_64 cache: true - - name: Setup xcode - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: latest-stable - - name: Build working-directory: ${{ runner.temp }} run: | From ef608827adbb7841e0afbd329a191ddbd29be0d4 Mon Sep 17 00:00:00 2001 From: ExplosBlue Date: Fri, 7 Aug 2026 01:23:35 +0100 Subject: [PATCH 4/5] Update CI --- CoinKiller.pro | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CoinKiller.pro b/CoinKiller.pro index ddf5eff..cc515a6 100644 --- a/CoinKiller.pro +++ b/CoinKiller.pro @@ -189,4 +189,8 @@ msvc { QMAKE_CXXFLAGS += -std=c++23 } +macx-clang { + QMAKE_CXXFLAGS += -include arm_acle.h +} + INCLUDEPATH += third_party/ExETC1 From ad9e45864d1dc3234090851f1b07ce5923e5f598 Mon Sep 17 00:00:00 2001 From: ExplosBlue Date: Fri, 7 Aug 2026 01:33:25 +0100 Subject: [PATCH 5/5] Update CI --- third_party/ExETC1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/ExETC1 b/third_party/ExETC1 index fc550bf..2433993 160000 --- a/third_party/ExETC1 +++ b/third_party/ExETC1 @@ -1 +1 @@ -Subproject commit fc550bfd3f2cf4a4ef6c4e3a8de5364d97bf3987 +Subproject commit 24339933d14b479226110f87508134d40b8bb5c1