From e419372646e85563b1082894c68beb3ded60c2cd Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Tue, 27 May 2025 10:32:06 +0200 Subject: [PATCH 1/3] Fix bundle-bundle test --- src/cli/test/bundle/Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cli/test/bundle/Gemfile b/src/cli/test/bundle/Gemfile index 98fd9c91490..30efad06e1e 100644 --- a/src/cli/test/bundle/Gemfile +++ b/src/cli/test/bundle/Gemfile @@ -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' From 2d7e691ef90a0b6c0269204cb580ad5d18e5c0c5 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Tue, 27 May 2025 10:33:44 +0200 Subject: [PATCH 2/3] Set prerelease tag to rc1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 86248ba52de..27c500babb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}") From 30de45e33a47a6ffceee1fa0d15d966e4f1762d0 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Tue, 27 May 2025 16:50:11 +0200 Subject: [PATCH 3/3] Target E+ Release on NREL/EnergyPlus --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27c500babb9..a9d58a5928e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") @@ -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") @@ -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") @@ -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)