Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 17 additions & 29 deletions .github/workflows/BuildAndRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
SOURCE_DIR: ${{ github.workspace }}
QT_VERSION: 6.2
QT_VERSION: 6.10.2

permissions:
contents: write
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -156,7 +142,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions CoinKiller.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion third_party/ExETC1
Submodule ExETC1 updated 1 files
+8 −2 Etc1.cpp
Loading