Commit 09a36ad62bfa787642778b8076ae5b4ba4a64fcc
1 parent
6b114684
Run Windows build on Windows 2022 runner
Showing
4 changed files
with
10 additions
and
7 deletions
.github/workflows/main.yml
| @@ -54,7 +54,7 @@ jobs: | @@ -54,7 +54,7 @@ jobs: | ||
| 54 | name: distribution | 54 | name: distribution |
| 55 | path: distribution | 55 | path: distribution |
| 56 | Windows: | 56 | Windows: |
| 57 | - runs-on: windows-2019 | 57 | + runs-on: windows-latest |
| 58 | needs: Prebuild | 58 | needs: Prebuild |
| 59 | strategy: | 59 | strategy: |
| 60 | fail-fast: false | 60 | fail-fast: false |
ChangeLog
| @@ -2,6 +2,11 @@ | @@ -2,6 +2,11 @@ | ||
| 2 | 2 | ||
| 3 | * 10.6.3: release | 3 | * 10.6.3: release |
| 4 | 4 | ||
| 5 | + * Use Windows 2022 github runners and therefore Visual Studio 2022 | ||
| 6 | + to create Windows distributions | ||
| 7 | + | ||
| 8 | + * Fix DLL export issue with mingw (Windows) | ||
| 9 | + | ||
| 5 | 2022-03-07 Jay Berkenbilt <ejb@ql.org> | 10 | 2022-03-07 Jay Berkenbilt <ejb@ql.org> |
| 6 | 11 | ||
| 7 | * Minor internal changes to assist with building in other | 12 | * Minor internal changes to assist with building in other |
build-scripts/build-windows
| @@ -6,16 +6,14 @@ tool=$2 | @@ -6,16 +6,14 @@ tool=$2 | ||
| 6 | 6 | ||
| 7 | if [[ $tool == mingw ]]; then | 7 | if [[ $tool == mingw ]]; then |
| 8 | pacman -Sy --noconfirm make base-devel tar zip unzip | 8 | pacman -Sy --noconfirm make base-devel tar zip unzip |
| 9 | - if [ -d /c/msys64 ]; then | ||
| 10 | - PATH="/c/msys64/mingw$wordsize/bin:$PATH" | ||
| 11 | - else | 9 | + if [ ! -x /c/msys64/mingw$wordsize/bin/g++.exe ]; then |
| 12 | if [[ $wordsize == 64 ]]; then | 10 | if [[ $wordsize == 64 ]]; then |
| 13 | pacman -Sy --noconfirm mingw-w64-x86_64-toolchain | 11 | pacman -Sy --noconfirm mingw-w64-x86_64-toolchain |
| 14 | else | 12 | else |
| 15 | pacman -Sy --noconfirm mingw-w64-i686-toolchain | 13 | pacman -Sy --noconfirm mingw-w64-i686-toolchain |
| 16 | fi | 14 | fi |
| 17 | - PATH="/c/tools/msys64/mingw$wordsize/bin:$PATH" | ||
| 18 | fi | 15 | fi |
| 16 | + PATH="/c/msys64/mingw$wordsize/bin:$PATH" | ||
| 19 | g++ -v | 17 | g++ -v |
| 20 | elif [[ $tool == msvc ]]; then | 18 | elif [[ $tool == msvc ]]; then |
| 21 | cl | 19 | cl |
build-scripts/build-windows.bat
| @@ -3,9 +3,9 @@ | @@ -3,9 +3,9 @@ | ||
| 3 | setlocal ENABLEDELAYEDEXPANSION | 3 | setlocal ENABLEDELAYEDEXPANSION |
| 4 | if %2 == msvc ( | 4 | if %2 == msvc ( |
| 5 | if %1 == 64 ( | 5 | if %1 == 64 ( |
| 6 | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" | 6 | + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" |
| 7 | ) else ( | 7 | ) else ( |
| 8 | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat" | 8 | + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" |
| 9 | ) | 9 | ) |
| 10 | choco install zip | 10 | choco install zip |
| 11 | bash ./build-scripts/build-windows %1 %2 | 11 | bash ./build-scripts/build-windows %1 %2 |