Skip to content

Commit 9b096c6

Browse files
committed
Restore Old Windows Action
MSVC runtime stuff was more of a pain for users, reverting this to the old working state for now
1 parent 28a9112 commit 9b096c6

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

.github/workflows/build_windows.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
required: false
2727

2828
env:
29-
QT_VERSION: 6.10.1
29+
QT_VERSION: 6.7.1
3030
EXTRA_CMAKE_FLAGS: ""
3131

3232
jobs:
@@ -55,9 +55,14 @@ jobs:
5555
version: ${{ env.QT_VERSION }}
5656
host: 'windows'
5757
target: 'desktop'
58-
arch: 'win64_msvc2022_64'
58+
arch: 'win64_mingw'
5959
cache: true
6060

61+
- name: Install GCC 11.2.0
62+
uses: egor-tensin/setup-mingw@v3
63+
with:
64+
version: 11.2.0
65+
6166
- name: Set Debug Flags
6267
if: inputs.build_type == 'Debug'
6368
run: echo "EXTRA_CMAKE_FLAGS=-DENABLE_DEBUG=True ${{ env.EXTRA_CMAKE_FLAGS }}" >> $env:GITHUB_ENV
@@ -70,7 +75,7 @@ jobs:
7075
working-directory: ${{ github.workspace }}
7176
env:
7277
SEED_KEY: ${{ secrets.SEED_KEY }}
73-
run: cmake -B build -DGITHUB_WORKFLOW=True -DQT_GUI=True -DEMBED_DATA=True "${{ env.EXTRA_CMAKE_FLAGS }}"
78+
run: cmake -G "MinGW Makefiles" -B build -DGITHUB_WORKFLOW=True -DQT_GUI=True -DEMBED_DATA=True "${{ env.EXTRA_CMAKE_FLAGS }}"
7479

7580
- name: Build
7681
working-directory: ${{ github.workspace }}
@@ -87,8 +92,11 @@ jobs:
8792
shell: cmd # Setting up environment vars only works properly in cmd?
8893
run: |
8994
mkdir wwhd_rando_windows
90-
cp ${{ inputs.build_type }}\wwhd_rando.exe wwhd_rando_windows\wwhd_rando.exe
91-
cd ${{ github.workspace }}\build\wwhd_rando_windows && windeployqt wwhd_rando.exe --no-translations --no-system-d3d-compiler --no-opengl-sw
95+
cp wwhd_rando.exe wwhd_rando_windows\wwhd_rando.exe
96+
cp ${{ github.workspace }}\..\Qt\${{ env.QT_VERSION }}\mingw_64\bin\libgcc_s_seh-1.dll wwhd_rando_windows\libgcc_s_seh-1.dll
97+
cp ${{ github.workspace }}\..\Qt\${{ env.QT_VERSION }}\mingw_64\bin\libstdc++-6.dll wwhd_rando_windows\libstdc++-6.dll
98+
cp ${{ github.workspace }}\..\Qt\${{ env.QT_VERSION }}\mingw_64\bin\libwinpthread-1.dll wwhd_rando_windows\libwinpthread-1.dll
99+
${{ 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
92100
93101
- name: Save Artifact
94102
uses: actions/upload-artifact@v6

0 commit comments

Comments
 (0)