diff --git a/.github/workflows/BuildAndRelease.yml b/.github/workflows/BuildAndRelease.yml index 70dfee5..0134ca0 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,32 +102,23 @@ 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' - - - name: Setup xcode - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: latest-stable + version: ${{ env.QT_VERSION }} + arch: clang_64 + cache: true - name: Build working-directory: ${{ runner.temp }} 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 @@ -156,7 +142,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive @@ -193,6 +179,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 @@ -235,11 +223,11 @@ 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 - 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..cc515a6 100644 --- a/CoinKiller.pro +++ b/CoinKiller.pro @@ -183,4 +183,14 @@ TRANSLATIONS += \ CONFIG += c++23 +msvc { + QMAKE_CXXFLAGS += /std:c++latest +} else { + QMAKE_CXXFLAGS += -std=c++23 +} + +macx-clang { + QMAKE_CXXFLAGS += -include arm_acle.h +} + INCLUDEPATH += third_party/ExETC1 diff --git a/third_party/ExETC1 b/third_party/ExETC1 index 82c8f6c..2433993 160000 --- a/third_party/ExETC1 +++ b/third_party/ExETC1 @@ -1 +1 @@ -Subproject commit 82c8f6c51acc2dc6d8b20ef98ccb22801ae42070 +Subproject commit 24339933d14b479226110f87508134d40b8bb5c1