From fb64b32e478541edf4a8704d4d69943d41ddeea3 Mon Sep 17 00:00:00 2001 From: Brian Ball Date: Wed, 22 Nov 2023 18:15:00 -0500 Subject: [PATCH] 3.7.0 (#725) Update openstudio server to 3.7.0 --- .github/workflows/openstudio-server-tests.yml | 6 +++--- .github/workflows/security-scan.yml | 6 +++--- CHANGELOG.md | 9 +++++++++ Dockerfile | 4 ++-- appveyor.yml | 4 ++-- ci/appveyor/setup.cmd | 2 +- ci/github-actions/install_openstudio.sh | 2 +- ci/github-actions/setup.sh | 2 +- server/app/lib/openstudio_server/version.rb | 4 ++-- 9 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.github/workflows/openstudio-server-tests.yml b/.github/workflows/openstudio-server-tests.yml index 8901f6130..d5dc610fc 100644 --- a/.github/workflows/openstudio-server-tests.yml +++ b/.github/workflows/openstudio-server-tests.yml @@ -11,8 +11,8 @@ on: [push, pull_request] env: USE_TESTING_TIMEOUTS: "true" OPENSTUDIO_VERSION: 3.7.0 - OPENSTUDIO_VERSION_SHA: 37087fd612 - OPENSTUDIO_VERSION_EXT: "-rc3" + OPENSTUDIO_VERSION_SHA: d5269793f1 + OPENSTUDIO_VERSION_EXT: "" DOCKER_COMPOSE_VERSION: 1.21.1 BUNDLE_WITHOUT: native_ext @@ -97,7 +97,7 @@ jobs: - name: docker shell: bash run: | - export OPENSTUDIO_TAG=3.7.0-rc3 + export OPENSTUDIO_TAG=3.7.0 sed -i -E "s/.git//g" .dockerignore docker volume create --name=osdata docker images --all diff --git a/.github/workflows/security-scan.yml b/.github/workflows/security-scan.yml index c8071797f..6cd6c4437 100644 --- a/.github/workflows/security-scan.yml +++ b/.github/workflows/security-scan.yml @@ -11,8 +11,8 @@ on: [push, pull_request] env: USE_TESTING_TIMEOUTS: "true" OPENSTUDIO_VERSION: 3.7.0 - OPENSTUDIO_VERSION_SHA: 37087fd612 - OPENSTUDIO_VERSION_EXT: "-rc3" + OPENSTUDIO_VERSION_SHA: d5269793f1 + OPENSTUDIO_VERSION_EXT: "" DOCKER_COMPOSE_VERSION: 1.21.1 BUNDLE_WITHOUT: native_ext @@ -31,7 +31,7 @@ jobs: - name: docker shell: bash run: | - export OPENSTUDIO_TAG=3.7.0-rc3 + export OPENSTUDIO_TAG=3.7.0 sed -i -E "s/.git//g" .dockerignore docker volume create --name=osdata docker images --all diff --git a/CHANGELOG.md b/CHANGELOG.md index 72ca4e4b7..e98c5e400 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ OpenStudio Server ================= +Version 3.7.0 +------------- +* update Analysis-gem to 1.3.5 in https://github.com/NREL/OpenStudio-server/pull/722 +* update Mongo to 6.0.9 in https://github.com/NREL/OpenStudio-server/pull/709 +* update Passenger to 6.0.18 in https://github.com/NREL/OpenStudio-server/pull/714 +* Fix indicies in Mongo Database in https://github.com/NREL/OpenStudio-server/pull/713 +* add XML and MAT files as valid downloadable Report Types https://github.com/NREL/OpenStudio-server/pull/720 + + Version 3.5.1 ------------- * update urbanopt to 0.9.0 diff --git a/Dockerfile b/Dockerfile index 2d565014b..1eb1133d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ # NOTES: Currently this is one big dockerfile and non-optimal. #may include suffix -ARG OPENSTUDIO_VERSION=3.7.0-rc3 -FROM nrel/openstudio:3.7.0-rc3 as base +ARG OPENSTUDIO_VERSION=3.7.0 +FROM nrel/openstudio:3.7.0 as base MAINTAINER Nicholas Long nicholas.long@nrel.gov ENV DEBIAN_FRONTEND=noninteractive diff --git a/appveyor.yml b/appveyor.yml index a6302213c..125f27e4d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,8 +5,8 @@ image: Visual Studio 2019 environment: USE_TESTING_TIMEOUTS: "true" OPENSTUDIO_VERSION: 3.7.0 - OPENSTUDIO_VERSION_SHA: 37087fd612 - OPENSTUDIO_VERSION_EXT: "-rc3" + OPENSTUDIO_VERSION_SHA: d5269793f1 + OPENSTUDIO_VERSION_EXT: "" OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe BUILD_TYPE: "test" SKIP_COVERALLS: "true" diff --git a/ci/appveyor/setup.cmd b/ci/appveyor/setup.cmd index 2c234b9ce..9bd33da6a 100644 --- a/ci/appveyor/setup.cmd +++ b/ci/appveyor/setup.cmd @@ -10,7 +10,7 @@ set OS_INSTALL_NAME=OpenStudio-%OPENSTUDIO_VERSION%%OPENSTUDIO_VERSION_EXT%%%2B% echo Install name is %OS_INSTALL_NAME% REM curl -SLO --insecure https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/develop/%OS_INSTALL_NAME% -curl -SLO --insecure https://github.com/NREL/OpenStudio/releases/download/v3.7.0-rc3/%OS_INSTALL_NAME% +curl -SLO --insecure https://github.com/NREL/OpenStudio/releases/download/v3.7.0/%OS_INSTALL_NAME% dir . REM Install OpenStudio %OS_INSTALL_NAME% --script ci/appveyor/install-windows.qs diff --git a/ci/github-actions/install_openstudio.sh b/ci/github-actions/install_openstudio.sh index 7eaee271e..bf4a217e0 100755 --- a/ci/github-actions/install_openstudio.sh +++ b/ci/github-actions/install_openstudio.sh @@ -11,7 +11,7 @@ if [ ! -z ${OPENSTUDIO_VERSION} ] && [ ! -z ${OPENSTUDIO_SHA} ]; then OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}%2B${OPENSTUDIO_SHA}-Ubuntu-20.04-x86_64.deb echo "Installing OpenStudio ${OPENSTUDIO_DOWNLOAD_FILENAME}" #OPENSTUDIO_DOWNLOAD_BASE_URL=https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/develop - OPENSTUDIO_DOWNLOAD_BASE_URL=https://github.com/NREL/OpenStudio/releases/download/v3.7.0-rc3 + OPENSTUDIO_DOWNLOAD_BASE_URL=https://github.com/NREL/OpenStudio/releases/download/v3.7.0 OPENSTUDIO_DOWNLOAD_URL=$OPENSTUDIO_DOWNLOAD_BASE_URL/$OPENSTUDIO_DOWNLOAD_FILENAME # copying this from the docker-openstudio dockerfile diff --git a/ci/github-actions/setup.sh b/ci/github-actions/setup.sh index 82d6129ad..91f732e86 100755 --- a/ci/github-actions/setup.sh +++ b/ci/github-actions/setup.sh @@ -37,7 +37,7 @@ else export OS_NAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}%2B${OPENSTUDIO_VERSION_SHA}-Darwin-x86_64 export OS_NAME_WITH_PLUS=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}+${OPENSTUDIO_VERSION_SHA}-Darwin-x86_64 #curl -SL --insecure https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/develop/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz - curl -SL --insecure https://github.com/NREL/OpenStudio/releases/download/v3.7.0-rc3/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz + curl -SL --insecure https://github.com/NREL/OpenStudio/releases/download/v3.7.0/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz # OSX downloads with %2B but installs with + sign. These are the encoded chars in url strings. #hdiutil attach ${OS_NAME}.dmg #sed -i -e "s|REPLACEME|$HOME/openstudio|" ci/github-actions/install-mac.qs diff --git a/server/app/lib/openstudio_server/version.rb b/server/app/lib/openstudio_server/version.rb index a19178330..8f58a6242 100644 --- a/server/app/lib/openstudio_server/version.rb +++ b/server/app/lib/openstudio_server/version.rb @@ -7,6 +7,6 @@ module OpenstudioServer VERSION = '3.7.0'.freeze # format should be ^.*\-{1}[a-z]+[0-9]+ # for example: -rc1, -beta6, -customusecase0 - VERSION_EXT = '-rc3'.freeze # with preceding - or + - OS_SHA = '37087fd612'.freeze + VERSION_EXT = ''.freeze # with preceding - or + + OS_SHA = 'd5269793f1'.freeze end