Skip to content
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

Jump to bottom

Post release adjustments - bump to 3.9.1-alpha #5306

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+40,566 −18
Open

Post release adjustments - bump to 3.9.1-alpha #5306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
206db70
Update openstudio3-gems to v3.9.0 (and add the missing arm64 linux one)
jmarrec Nov 18, 2024
877d275
Bump to 3.9.1-alpha and add default VT
jmarrec Nov 18, 2024
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
26 changes: 13 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if(CCACHE_PROGRAM)
endif()

# Project macro can only take digits in the version, it splits these out to specific variables
project(OpenStudio VERSION 3.9.0)
project(OpenStudio VERSION 3.9.1)

include(CMake/compiler_flags.cmake)

Expand Down Expand Up @@ -161,7 +161,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 "")
set(PROJECT_VERSION_PRERELEASE "alpha")

# 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 @@ -847,7 +847,7 @@ if(BUILD_CLI)
set(OPENSTUDIO_GEMS_BASEURL "http://openstudio-resources.s3.amazonaws.com/dependencies")

# TODO: temp
set(OPENSTUDIO_GEMS_BASEURL "https://github.com/NREL/openstudio-gems/releases/download/v3.9.0-RC3")
set(OPENSTUDIO_GEMS_BASEURL "https://github.com/NREL/openstudio-gems/releases/download/v3.9.0")

# To use the package produced by a PR to https://github.com/NREL/openstudio-gems
set(USE_OPENSTUDIO_GEMS_PR FALSE)
Expand All @@ -859,28 +859,28 @@ if(BUILD_CLI)
if(UNIX)
if(APPLE)
if (ARCH MATCHES arm64)
set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20241112-darwin_arm64-3.2.2.tar.gz")
set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "cb6a884366780c8ba5da2852ca60e98a")
set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20241114-darwin_arm64-3.2.2.tar.gz")
set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "63ae214118b20ce98bc8552c8e151e0d")
else()
set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20241112-darwin-3.2.2.tar.gz")
set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "ce81fcf1bf707281082cde3d87dac114")
set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20241114-darwin-3.2.2.tar.gz")
set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "53c20b79ee601eeb347cf9e5c1986943")
endif()
else()
if (ARCH MATCHES "arm64")
set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20240517-linux_arm64-3.2.2.tar.gz")
set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "f6d094a3bdaf1476ce7911e74276993b")
set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20241114-linux_arm64-3.2.2.tar.gz")
set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "782980448f88ef5383536cada86d01d5")
else()
set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20241112-linux-3.2.2.tar.gz")
set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "7551691c842a86cc8198959b5d0f1ee9")
set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20241114-linux-3.2.2.tar.gz")
set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "37ab31c45fbb71421f94a05bcea61b21")
endif()
if (USE_OPENSTUDIO_GEMS_PR)
set(OPENSTUDIO_GEMS_BASEURL "${OPENSTUDIO_GEMS_BASEURL}/openstudio-gems-linux/${OPENSTUDIO_GEMS_PR_NUMBER}")
endif()
endif()
elseif(WIN32)
# OpenStudio gems are only supported on 64 bit windows
set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20241112-windows-3.2.2.tar.gz")
set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "8f1cdcca664a1d3d80908230a00981ef")
set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20241114-windows-3.2.2.tar.gz")
set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "0029fe4e06dd9ffef39dff4908237357")
if (USE_OPENSTUDIO_GEMS_PR)
set(OPENSTUDIO_GEMS_BASEURL "${OPENSTUDIO_GEMS_BASEURL}/openstudio-gems-windows/${OPENSTUDIO_GEMS_PR_NUMBER}")
endif()
Expand Down
4 changes: 2 additions & 2 deletions resources/model/OpenStudio.idd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!IDD_Version 3.9.0
!IDD_Version 3.9.1
! *****************************************************************************
! This file is the Input Data Dictionary (IDD) for OpenStudio Model.
!
Expand Down Expand Up @@ -40,7 +40,7 @@ OS:Version,
\required-field
A2, \field Version Identifier
\type alpha
\default 3.9.0
\default 3.9.1
A3; \field Prerelease Identifier
\type alpha

Expand Down
7 changes: 4 additions & 3 deletions src/osversion/VersionTranslator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ namespace osversion {
m_updateMethods[VersionString("3.7.0")] = &VersionTranslator::update_3_6_1_to_3_7_0;
m_updateMethods[VersionString("3.8.0")] = &VersionTranslator::update_3_7_0_to_3_8_0;
m_updateMethods[VersionString("3.9.0")] = &VersionTranslator::update_3_8_0_to_3_9_0;
// m_updateMethods[VersionString("3.9.0")] = &VersionTranslator::defaultUpdate;
m_updateMethods[VersionString("3.9.1")] = &VersionTranslator::defaultUpdate;
// m_updateMethods[VersionString("3.10.0")] = &VersionTranslator::defaultUpdate;

// List of previous versions that may be updated to this one.
// - To increment the translator, add an entry for the version just released (branched for
Expand Down Expand Up @@ -182,9 +183,9 @@ namespace osversion {
VersionString("2.7.1"), VersionString("2.7.2"), VersionString("2.8.0"), VersionString("2.8.1"), VersionString("2.9.0"),
VersionString("2.9.1"), VersionString("3.0.0"), VersionString("3.0.1"), VersionString("3.1.0"), VersionString("3.2.0"),
VersionString("3.2.1"), VersionString("3.3.0"), VersionString("3.4.0"), VersionString("3.5.0"), VersionString("3.5.1"),
VersionString("3.6.0"), VersionString("3.6.1"), VersionString("3.7.0"), VersionString("3.8.0"),
VersionString("3.6.0"), VersionString("3.6.1"), VersionString("3.7.0"), VersionString("3.8.0"), VersionString("3.9.0"),
// Note: do **not** include the **current** version in m_startVersions, stop at the previous release
//VersionString("3.9.0"),
//VersionString("3.9.1"),
};
}

Expand Down
Loading