mirror of
https://github.com/qpdf/qpdf.git
synced 2024-06-12 23:22:21 +00:00
Run Windows build on Windows 2022 runner
This commit is contained in:
parent
6b114684c2
commit
09a36ad62b
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
|
@ -54,7 +54,7 @@ jobs:
|
||||||
name: distribution
|
name: distribution
|
||||||
path: distribution
|
path: distribution
|
||||||
Windows:
|
Windows:
|
||||||
runs-on: windows-2019
|
runs-on: windows-latest
|
||||||
needs: Prebuild
|
needs: Prebuild
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
|
|
@ -2,6 +2,11 @@
|
||||||
|
|
||||||
* 10.6.3: release
|
* 10.6.3: release
|
||||||
|
|
||||||
|
* Use Windows 2022 github runners and therefore Visual Studio 2022
|
||||||
|
to create Windows distributions
|
||||||
|
|
||||||
|
* Fix DLL export issue with mingw (Windows)
|
||||||
|
|
||||||
2022-03-07 Jay Berkenbilt <ejb@ql.org>
|
2022-03-07 Jay Berkenbilt <ejb@ql.org>
|
||||||
|
|
||||||
* Minor internal changes to assist with building in other
|
* Minor internal changes to assist with building in other
|
||||||
|
|
|
@ -6,16 +6,14 @@ tool=$2
|
||||||
|
|
||||||
if [[ $tool == mingw ]]; then
|
if [[ $tool == mingw ]]; then
|
||||||
pacman -Sy --noconfirm make base-devel tar zip unzip
|
pacman -Sy --noconfirm make base-devel tar zip unzip
|
||||||
if [ -d /c/msys64 ]; then
|
if [ ! -x /c/msys64/mingw$wordsize/bin/g++.exe ]; then
|
||||||
PATH="/c/msys64/mingw$wordsize/bin:$PATH"
|
|
||||||
else
|
|
||||||
if [[ $wordsize == 64 ]]; then
|
if [[ $wordsize == 64 ]]; then
|
||||||
pacman -Sy --noconfirm mingw-w64-x86_64-toolchain
|
pacman -Sy --noconfirm mingw-w64-x86_64-toolchain
|
||||||
else
|
else
|
||||||
pacman -Sy --noconfirm mingw-w64-i686-toolchain
|
pacman -Sy --noconfirm mingw-w64-i686-toolchain
|
||||||
fi
|
fi
|
||||||
PATH="/c/tools/msys64/mingw$wordsize/bin:$PATH"
|
|
||||||
fi
|
fi
|
||||||
|
PATH="/c/msys64/mingw$wordsize/bin:$PATH"
|
||||||
g++ -v
|
g++ -v
|
||||||
elif [[ $tool == msvc ]]; then
|
elif [[ $tool == msvc ]]; then
|
||||||
cl
|
cl
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
setlocal ENABLEDELAYEDEXPANSION
|
setlocal ENABLEDELAYEDEXPANSION
|
||||||
if %2 == msvc (
|
if %2 == msvc (
|
||||||
if %1 == 64 (
|
if %1 == 64 (
|
||||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
||||||
) else (
|
) else (
|
||||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
|
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
|
||||||
)
|
)
|
||||||
choco install zip
|
choco install zip
|
||||||
bash ./build-scripts/build-windows %1 %2
|
bash ./build-scripts/build-windows %1 %2
|
||||||
|
|
Loading…
Reference in New Issue
Block a user