Skip to content

Commit f7c0b83

Browse files
committed
Update build scripts for improved error messaging and version tagging
1 parent 298b9e1 commit f7c0b83

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

.github/workflows/build-installers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
path: build/NREL/export/*.tar.gz
5050

5151
build-macos:
52-
runs-on: macos-15-intel # Matching the test workflow
52+
runs-on: macos-15-intel # Intel runner required for x86_64 architecture compatibility with OpenStudio (matching the test workflow)
5353
steps:
5454
- name: Check out repository
5555
uses: actions/checkout@v4

ci/github-actions/setup_win.bat

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,36 @@ set "Url=https://github.com/NREL/OpenStudio/releases/download/v%OPENSTUDIO_VERSI
88
echo Downloading %Url%...
99
powershell -Command "Invoke-WebRequest -Uri '%Url%' -OutFile '%InstallerName%'"
1010
if %ERRORLEVEL% neq 0 (
11-
echo Error downloading OpenStudio
11+
echo Failed to download OpenStudio from %Url% (exit code %ERRORLEVEL%)
1212
exit /b %ERRORLEVEL%
1313
)
1414

1515
echo Installing OpenStudio...
1616
start /wait "" ".\%InstallerName%" /S /D=C:\projects\openstudio
1717
if %ERRORLEVEL% neq 0 (
18-
echo Error installing OpenStudio
18+
echo Failed to install OpenStudio from "%InstallerName%" (exit code %ERRORLEVEL%)
1919
exit /b %ERRORLEVEL%
2020
)
2121

2222
REM Verify OpenStudio
2323
set "PATH=C:\projects\openstudio\bin;%PATH%"
2424
call openstudio openstudio_version
2525
if %ERRORLEVEL% neq 0 (
26-
echo Error verifying OpenStudio
26+
echo Failed to verify OpenStudio installation - 'openstudio openstudio_version' command failed (exit code %ERRORLEVEL%)
2727
exit /b %ERRORLEVEL%
2828
)
2929

3030
REM --- Setup MSYS2 and Dependencies ---
3131
call ridk install 2 3
3232
if %ERRORLEVEL% neq 0 (
33-
echo Error running ridk install
33+
echo Failed to install MSYS2 dependencies via ridk (exit code %ERRORLEVEL%)
3434
exit /b %ERRORLEVEL%
3535
)
3636

3737
call gcc --version
38+
if %ERRORLEVEL% neq 0 (
39+
echo Error: gcc not found
40+
exit /b %ERRORLEVEL%
41+
)
3842

3943
endlocal

docker/deployment/scripts/deploy_docker_github_actions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ elif [ "${GITHUB_REF}" == "refs/heads/master" ]; then
1515
elif [ "${GITHUB_REF}" == "refs/heads/setup_github_actions" ]; then
1616
IMAGETAG=experimental
1717
elif [ "${GITHUB_REF}" == "refs/heads/3.11.0" ]; then
18-
IMAGETAG="3.11.0-rc2"
18+
IMAGETAG="3.11.0"
1919
fi
2020

2121
if [ "${IMAGETAG}" != "skip" ]; then

0 commit comments

Comments
 (0)