Skip to content

Fix bundle bundle test + set PRERELEASE tag to rc1 #5415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmarrec merged 3 commits into from
May 27, 2025
Merged

Fix bundle bundle test + set PRERELEASE tag to rc1 #5415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e419372
Fix bundle-bundle test
jmarrec May 27, 2025
2d7e691
Set prerelease tag to rc1
jmarrec May 27, 2025
30de45e
Target E+ Release on NREL/EnergyPlus
jmarrec May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ get_directory_property(hasParent PARENT_DIRECTORY)

# TODO: Modify the more specific variables as needed to indicate prerelease, etc
# Keep in beta in-between release cycles. Set to empty string (or comment out) for official)
set(PROJECT_VERSION_PRERELEASE "alpha")
set(PROJECT_VERSION_PRERELEASE "rc1")

# OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag
set(OPENSTUDIO_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
Expand Down Expand Up @@ -205,7 +205,7 @@ set(ENERGYPLUS_BUILD_SHA "1c11a3d85f")
# from the github releases
set(ENERGYPLUS_RELEASE_NAME "v25.1.0-WithDSOASpaceListFixes")

set(ENERGYPLUS_REPO "jmarrec")
set(ENERGYPLUS_REPO "NREL")

# Radiance
set(RADIANCE_VERSION "5.0.a.12")
Expand Down Expand Up @@ -645,10 +645,10 @@ endif()
if(UNIX)
if(APPLE)
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH 7301caad82ed104f23704e6123345989)
set(ENERGYPLUS_EXPECTED_HASH 5ba510218a5808edbffeaaa962638450)
set(ENERGYPLUS_PLATFORM "Darwin-macOS13-arm64")
else()
set(ENERGYPLUS_EXPECTED_HASH 8746aaad0e901f640b644ffc96d4cde9)
set(ENERGYPLUS_EXPECTED_HASH ad97f96a4bd529d58e98bbd8f81b0eb0)
set(ENERGYPLUS_PLATFORM "Darwin-macOS12.1-x86_64")
endif()
elseif(LSB_RELEASE_ID_SHORT MATCHES "CentOS")
Expand All @@ -657,15 +657,15 @@ if(UNIX)
else()
if(LSB_RELEASE_VERSION_SHORT MATCHES "24.04")
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH 143d5972ba83ee676a8a789104242e19)
set(ENERGYPLUS_EXPECTED_HASH dbe28aebdbfc28ee8538cabb2dd15305)
else()
set(ENERGYPLUS_EXPECTED_HASH e0733483ab27dd6887ac596c047ff4ac)
set(ENERGYPLUS_EXPECTED_HASH af8ee54182777923fa4154b122c39447)
endif()
elseif(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH 66e36cf50076c87feeb12fee6bede7f5)
set(ENERGYPLUS_EXPECTED_HASH 2ddd6ddb854cc3957943a9dd396c2dce)
else()
set(ENERGYPLUS_EXPECTED_HASH 29365cf56e4d65bac3c64a4568acecc8)
set(ENERGYPLUS_EXPECTED_HASH 7700f3f7865e36e442b7d171c2e2f96a)
endif()
else() # e.g., 18.04, 20.04
message(FATAL_ERROR "EnergyPlus no longer provides packages for Ubuntu < 22.04")
Expand Down Expand Up @@ -702,7 +702,7 @@ elseif(WIN32)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64 bit
set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-x86_64")
set(ENERGYPLUS_ARCH 64)
set(ENERGYPLUS_EXPECTED_HASH d4870d7e79c233c4a938df056f64ccce)
set(ENERGYPLUS_EXPECTED_HASH 630e0b8de20dea68185224072c079d90)
else()
set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-i386")
set(ENERGYPLUS_ARCH 32)
Expand Down
1 change: 1 addition & 0 deletions src/cli/test/bundle/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
source 'http://rubygems.org'

gem 'openstudio-workflow', '2.4.0' # This is compatible with bundler 2.4.10 / Ruby 3.2 (OS 3.8+), and already older than currently used at this time
gem 'tilt', '2.0.8'