Commit 82e3b846f for imagemagick.org
commit 82e3b846faf0bd81b96c9a2206699225dc9d4d57
Author: Dirk Lemstra <dirk@lemstra.org>
Date: Sun May 24 08:59:41 2026 +0200
Use Visual Studio 2026 in the Windows build.
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 3cb7bb2af..7ed2e9e48 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -127,7 +127,7 @@ jobs:
name: Windows ${{matrix.quantum}}${{matrix.hdri_flag}}-${{matrix.architecture}} (${{matrix.buildType}})
needs:
- change_log
- runs-on: windows-2022
+ runs-on: windows-2025-vs2026
strategy:
fail-fast: false
@@ -172,17 +172,17 @@ jobs:
shell: cmd
working-directory: Configure
run: |
- Configure.Release.x64.exe /noWizard /VS2022 /deprecated /${{matrix.architecture}} /${{matrix.buildType}} /${{matrix.quantum}} /${{matrix.hdri}}
+ Configure.Release.x64.exe /noWizard /VS2026 /deprecated /${{matrix.architecture}} /${{matrix.buildType}} /${{matrix.quantum}} /${{matrix.hdri}}
- name: Build ImageMagick
shell: cmd
run: |
- call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+ call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat"
msbuild /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.architecture}}
build_windows_zero_configuration:
name: 'Windows Q16-HDRI-x64 (zero configuration ${{matrix.buildType}})'
- runs-on: windows-2022
+ runs-on: windows-2025-vs2026
strategy:
fail-fast: false
@@ -210,17 +210,17 @@ jobs:
shell: cmd
working-directory: Configure
run: |
- Configure.Release.x64.exe /noWizard /VS2022 /x64 /${{matrix.buildType}} /zeroConfigurationSupport
+ Configure.Release.x64.exe /noWizard /VS2026 /x64 /${{matrix.buildType}} /zeroConfigurationSupport
- name: Build ImageMagick
shell: cmd
run: |
- call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+ call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat"
msbuild /m /t:Rebuild /p:Configuration=Release,Platform=x64
build_msys2:
name: MSYS2 Q16-${{matrix.toolchain}}
- runs-on: windows-2022
+ runs-on: windows-2025
strategy:
matrix:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 39684940f..38e8ef6a9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -133,7 +133,7 @@ jobs:
build_windows:
name: Build Windows ${{matrix.architecture}}
- runs-on: windows-2022
+ runs-on: windows-2025-vs2026
strategy:
fail-fast: false
@@ -161,17 +161,17 @@ jobs:
shell: cmd
working-directory: Configure
run: |
- Configure.Release.x64.exe /noWizard /VS2022 /${{matrix.architecture}} /static
+ Configure.Release.x64.exe /noWizard /VS2026 /${{matrix.architecture}} /static
- name: Build ImageMagick
shell: cmd
run: |
- call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+ call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat"
msbuild IM7.Static.${{matrix.architecture}}.sln /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.architecture}}
build_msys2:
name: Build MSYS2
- runs-on: windows-2022
+ runs-on: windows-2025
steps:
- name: Prepare git
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7db32b5f5..124b53eb2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -87,7 +87,7 @@ jobs:
windows_installer:
name: Windows ${{matrix.quantum}}${{matrix.hdri_flag}}-${{matrix.architecture}} (${{matrix.buildType}})
- runs-on: windows-2022
+ runs-on: windows-2025-vs2026
needs:
- changelog
- version
@@ -161,12 +161,12 @@ jobs:
shell: cmd
working-directory: Configure
run: |
- Configure.Release.x64.exe /noWizard /VS2022 /installedSupport /deprecated /${{matrix.hdri}} /${{matrix.quantum}} /${{matrix.architecture}} /${{matrix.buildType}}
+ Configure.Release.x64.exe /noWizard /VS2026 /installedSupport /deprecated /${{matrix.hdri}} /${{matrix.quantum}} /${{matrix.architecture}} /${{matrix.buildType}}
- name: Build ImageMagick
shell: cmd
run: |
- call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+ call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat"
msbuild /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.architecture}}
- name: Build PerlMagick
@@ -174,7 +174,7 @@ jobs:
shell: cmd
run: |
set PATH=
- call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+ call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat"
cd ImageMagick\PerlMagick
set PATH=%PATH%;C:\Strawberry${{matrix.bit}}\c\bin;C:\Strawberry${{matrix.bit}}\perl\site\bin;C:\Strawberry${{matrix.bit}}\perl\bin;C:\WINDOWS\System32\WindowsPowerShell\v1.0
perl "Makefile.PL" "MAKE=nmake" "CC=g++"
@@ -193,7 +193,7 @@ jobs:
- name: Create installer
shell: cmd
run: |
- call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+ call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat"
"C:\Program Files (x86)\Inno Setup 6\iscc.exe" Configure\Installer\Inno\ImageMagick.iss
- name: Sign installer
@@ -212,7 +212,7 @@ jobs:
windows_source:
name: Create Windows source archive
- runs-on: windows-2022
+ runs-on: windows-2025
needs:
- changelog
- version
@@ -254,7 +254,7 @@ jobs:
windows_portable:
name: Windows portable ${{matrix.quantum}}${{matrix.hdri_flag}}-${{matrix.architecture}}
- runs-on: windows-2022
+ runs-on: windows-2025-vs2026
needs:
- changelog
- version
@@ -303,12 +303,12 @@ jobs:
shell: cmd
working-directory: Configure
run: |
- Configure.Release.x64.exe /noWizard /VS2022 /${{matrix.hdri}} /${{matrix.quantum}} /${{matrix.architecture}} /static /linkRuntime
+ Configure.Release.x64.exe /noWizard /VS2026 /${{matrix.hdri}} /${{matrix.quantum}} /${{matrix.architecture}} /static /linkRuntime
- name: Build ImageMagick
shell: cmd
run: |
- call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+ call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat"
msbuild /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.architecture}}
- name: Sign executables and libraries