Skip to content

Commit 1c970ed

Browse files
committed
Use the pre-build dependencies in the daily build.
1 parent e2784cb commit 1c970ed

File tree

1 file changed

+24
-22
lines changed

1 file changed

+24
-22
lines changed

.github/workflows/daily.yml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -95,39 +95,42 @@ jobs:
9595
exit $exit_code
9696
9797
build_windows:
98-
name: 'Windows Q${{matrix.quantum}}-${{matrix.platform}} hdri=${{matrix.hdri}} (${{matrix.buildType}})'
98+
name: Windows ${{matrix.quantum}}${{matrix.hdri_flag}}-${{matrix.architecture}} (${{matrix.buildType}})
9999
needs:
100100
- change_log
101101
runs-on: windows-2022
102102

103103
strategy:
104104
fail-fast: false
105105
matrix:
106-
quantum: [ 8, 16, 32, 64 ]
107-
hdri: [ yes, no ]
108-
buildType: [ dmt, smtd ]
109-
platform: [ x64, x86 ]
106+
architecture: [ x64, x86 ]
107+
buildType: [ dynamic, static ]
108+
quantum: [ Q8, Q16, Q32 ]
109+
hdri: [ hdri, noHdri ]
110110
exclude:
111-
- quantum: 8
112-
hdri: yes
113-
- quantum: 32
114-
hdri: no
115-
- quantum: 64
116-
hdri: no
111+
- quantum: Q8
112+
hdri: hdri
113+
- quantum: Q32
114+
hdri: noHdri
115+
include:
116+
- hdri: hdri
117+
hdri_flag: -HDRI
117118

118119
steps:
119-
- name: Clone ImageMagick-Windows
120+
- name: Clone ImageMagick
120121
uses: actions/checkout@v4
121122
with:
122-
repository: ImageMagick/ImageMagick-Windows
123-
path: ImageMagick-Windows
124-
ref: refs/heads/main
123+
path: ImageMagick
124+
125+
- name: Download configure
126+
shell: cmd
127+
run: |
128+
ImageMagick\.github\build\windows\download-configure.cmd
125129
126-
- name: Clone repositories
130+
- name: Download dependencies
127131
shell: cmd
128132
run: |
129-
cd ImageMagick-Windows
130-
CloneRepositories.IM6.cmd
133+
ImageMagick\.github\build\windows\download-dependencies.cmd windows-${{matrix.architecture}}-${{matrix.buildType}}-openMP.zip
131134
132135
- name: Download ChangeLog.md
133136
uses: actions/download-artifact@v4
@@ -137,13 +140,12 @@ jobs:
137140

138141
- name: Configure ImageMagick
139142
shell: cmd
143+
working-directory: Configure
140144
run: |
141-
cd ImageMagick-Windows\Configure
142-
Configure.Release.x64.exe /noWizard /VS2022 /includeOptional /incompatibleLicense /deprecated /${{matrix.platform}} /${{matrix.buildType}}
145+
Configure.Release.x64.exe /noWizard /VS2022 /deprecated /${{matrix.architecture}} /${{matrix.buildType}} /${{matrix.quantum}} /${{matrix.hdri}}
143146
144147
- name: Build ImageMagick
145148
shell: cmd
146149
run: |
147150
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
148-
cd ImageMagick-Windows
149-
msbuild /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.platform}}
151+
msbuild /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.architecture}}

0 commit comments

Comments
 (0)