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
4 changes: 2 additions & 2 deletions .github/workflows/build_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
required: false

env:
QT_VERSION: 6.8.1
QT_VERSION: 6.10.1
EXTRA_CMAKE_FLAGS: ""

jobs:
Expand All @@ -43,11 +43,11 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
aqtversion: '==3.1.*'
version: '${{ env.QT_VERSION }}'
host: 'mac'
target: 'desktop'
arch: 'clang_64'
cache: true

- name: Set Debug Flags
if: inputs.build_type == 'Debug'
Expand Down
19 changes: 5 additions & 14 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
required: false

env:
QT_VERSION: 6.7.1
QT_VERSION: 6.10.1
EXTRA_CMAKE_FLAGS: ""

jobs:
Expand Down Expand Up @@ -55,14 +55,8 @@ jobs:
version: ${{ env.QT_VERSION }}
host: 'windows'
target: 'desktop'
arch: 'win64_mingw'
arch: 'win64_msvc2022_64'
cache: true
cache-key-prefix: install-qt-${{ env.QT_VERSION }}-action

- name: Install GCC 11.2.0
uses: egor-tensin/setup-mingw@v2.2.0
with:
version: 11.2.0

- name: Set Debug Flags
if: inputs.build_type == 'Debug'
Expand All @@ -76,7 +70,7 @@ jobs:
working-directory: ${{ github.workspace }}
env:
SEED_KEY: ${{ secrets.SEED_KEY }}
run: cmake -G "MinGW Makefiles" -B build -DGITHUB_WORKFLOW=True -DQT_GUI=True -DEMBED_DATA=True "${{ env.EXTRA_CMAKE_FLAGS }}"
run: cmake -B build -DGITHUB_WORKFLOW=True -DQT_GUI=True -DEMBED_DATA=True "${{ env.EXTRA_CMAKE_FLAGS }}"

- name: Build
working-directory: ${{ github.workspace }}
Expand All @@ -93,11 +87,8 @@ jobs:
shell: cmd # Setting up environment vars only works properly in cmd?
run: |
mkdir wwhd_rando_windows
cp wwhd_rando.exe wwhd_rando_windows\wwhd_rando.exe
cp ${{ github.workspace }}\..\Qt\${{ env.QT_VERSION }}\mingw_64\bin\libgcc_s_seh-1.dll wwhd_rando_windows\libgcc_s_seh-1.dll
cp ${{ github.workspace }}\..\Qt\${{ env.QT_VERSION }}\mingw_64\bin\libstdc++-6.dll wwhd_rando_windows\libstdc++-6.dll
cp ${{ github.workspace }}\..\Qt\${{ env.QT_VERSION }}\mingw_64\bin\libwinpthread-1.dll wwhd_rando_windows\libwinpthread-1.dll
${{ github.workspace }}\..\Qt\${{ env.QT_VERSION }}\mingw_64\bin\qtenv2.bat && cd ${{ github.workspace }}\build\wwhd_rando_windows && windeployqt wwhd_rando.exe --no-translations --no-system-d3d-compiler --no-opengl-sw
cp ${{ inputs.build_type }}\wwhd_rando.exe wwhd_rando_windows\wwhd_rando.exe
cd ${{ github.workspace }}\build\wwhd_rando_windows && windeployqt wwhd_rando.exe --no-translations --no-system-d3d-compiler --no-opengl-sw

- name: Save Artifact
uses: actions/upload-artifact@v6
Expand Down