Skip to content

Commit 69cab72

Browse files
authored
Merge pull request #3162 from deslaughter/fix-simulink-build-win
Fix simulink build for Windows in GH Actions
2 parents 7a5db9d + ad3db13 commit 69cab72

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

.github/scripts/build_windows_executables.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ devenv vs-build/TurbSim/TurbSim.vfproj /Build "Release|x64"
3535
devenv vs-build/UnsteadyAero/UnsteadyAero.sln /Build "Release|x64"
3636

3737
@REM Build MATLAB solution last
38+
rd /s /q .\build\lib
3839
devenv vs-build/FAST/FAST.sln /Build "Release_Matlab|x64"
3940

4041
@REM Copy controllers to bin directory

.github/workflows/deploy.yml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -149,30 +149,15 @@ jobs:
149149
shell: cmd
150150
run: .github/scripts/windows_devenv_test.bat
151151

152-
- name: Install Intel oneAPI BaseKit (Windows)
152+
- name: Install Intel oneAPI Fortran Essentials (Windows)
153153
shell: cmd
154154
env:
155-
URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/7dff44ba-e3af-4448-841c-0d616c8da6e7/w_BaseKit_p_2024.1.0.595_offline.exe
156-
COMPONENTS: intel.oneapi.win.mkl.devel
155+
URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b626b5cf-8a15-40a4-be9a-9edabbb7cf17/intel-fortran-essentials-2025.3.0.333_offline.exe
157156
run: |
158157
curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5
159158
start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log
160159
del %TEMP%\webimage.exe
161-
webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=1 --log-dir=.
162-
set installer_exit_code=%ERRORLEVEL%
163-
rd /s/q "webimage_extracted"
164-
exit /b %installer_exit_code%
165-
166-
- name: Install Intel oneAPI HPCKit (Windows)
167-
shell: cmd
168-
env:
169-
URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/c95a3b26-fc45-496c-833b-df08b10297b9/w_HPCKit_p_2024.1.0.561_offline.exe
170-
COMPONENTS: intel.oneapi.win.ifort-compiler
171-
run: |
172-
curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5
173-
start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log
174-
del %TEMP%\webimage.exe
175-
webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=1 --log-dir=.
160+
webimage_extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=1 --log-dir=.
176161
set installer_exit_code=%ERRORLEVEL%
177162
rd /s/q "webimage_extracted"
178163
exit /b %installer_exit_code%

0 commit comments

Comments
 (0)