From 4a81b811c490ae80e878b5884af4b71d42d549c4 Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Mon, 22 May 2023 16:54:45 -0600 Subject: [PATCH] updates for 3.6.1 --- .github/workflows/openstudio-server-tests.yml | 6 +++--- .github/workflows/security-scan.yml | 6 +++--- Dockerfile | 4 ++-- appveyor.yml | 4 ++-- ci/appveyor/setup.cmd | 2 +- ci/github-actions/install_openstudio.sh | 2 +- ci/github-actions/setup.sh | 2 +- local_setup_scripts/rebuild_sr.sh | 2 +- local_setup_scripts/win64/rebuild_sr.sh | 2 +- local_setup_scripts/win64/rebuild_sr_no_rm.sh | 2 +- server/app/lib/openstudio_server/version.rb | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/openstudio-server-tests.yml b/.github/workflows/openstudio-server-tests.yml index 6c76aa958..9bea5d26e 100644 --- a/.github/workflows/openstudio-server-tests.yml +++ b/.github/workflows/openstudio-server-tests.yml @@ -10,8 +10,8 @@ on: [push, pull_request] env: USE_TESTING_TIMEOUTS: "true" - OPENSTUDIO_VERSION: 3.6.0 - OPENSTUDIO_VERSION_SHA: 860f5de185 + OPENSTUDIO_VERSION: 3.6.1 + OPENSTUDIO_VERSION_SHA: bb9481519e 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.6.0 + export OPENSTUDIO_TAG=3.6.1 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 d5a4cb249..41ff2fcef 100644 --- a/.github/workflows/security-scan.yml +++ b/.github/workflows/security-scan.yml @@ -10,8 +10,8 @@ on: [push, pull_request] env: USE_TESTING_TIMEOUTS: "true" - OPENSTUDIO_VERSION: 3.6.0 - OPENSTUDIO_VERSION_SHA: 860f5de185 + OPENSTUDIO_VERSION: 3.6.1 + OPENSTUDIO_VERSION_SHA: bb9481519e 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.6.0 + export OPENSTUDIO_TAG=3.6.1 sed -i -E "s/.git//g" .dockerignore docker volume create --name=osdata docker images --all diff --git a/Dockerfile b/Dockerfile index aa4dfdc96..ec593b79a 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.6.0 -FROM nrel/openstudio:3.6.0 as base +ARG OPENSTUDIO_VERSION=3.6.1 +FROM nrel/openstudio:3.6.1 as base MAINTAINER Nicholas Long nicholas.long@nrel.gov ENV DEBIAN_FRONTEND=noninteractive diff --git a/appveyor.yml b/appveyor.yml index 0173b004f..17aaa03af 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,8 +4,8 @@ image: Visual Studio 2019 environment: USE_TESTING_TIMEOUTS: "true" - OPENSTUDIO_VERSION: 3.6.0 - OPENSTUDIO_VERSION_SHA: 860f5de185 + OPENSTUDIO_VERSION: 3.6.1 + OPENSTUDIO_VERSION_SHA: bb9481519e OPENSTUDIO_VERSION_EXT: "" OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe BUILD_TYPE: "test" diff --git a/ci/appveyor/setup.cmd b/ci/appveyor/setup.cmd index c25883503..89b84f537 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.6.0/%OS_INSTALL_NAME% +curl -SLO --insecure https://github.com/NREL/OpenStudio/releases/download/v3.6.1/%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 b33205998..91fc70003 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.6.0 + OPENSTUDIO_DOWNLOAD_BASE_URL=https://github.com/NREL/OpenStudio/releases/download/v3.6.1 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 83411d5d8..01e364a6e 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.6.0/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz + curl -SL --insecure https://github.com/NREL/OpenStudio/releases/download/v3.6.1/${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/local_setup_scripts/rebuild_sr.sh b/local_setup_scripts/rebuild_sr.sh index f6eba60de..a9685049f 100755 --- a/local_setup_scripts/rebuild_sr.sh +++ b/local_setup_scripts/rebuild_sr.sh @@ -6,7 +6,7 @@ sleep 5 docker volume rm -f osdata || true docker volume rm -f dbdata || true docker image rm 127.0.0.1:5000/openstudio-server -f -docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.6.0 +docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.6.1 docker push 127.0.0.1:5000/openstudio-server cd docker/R/ #docker image rm 127.0.0.1:5000/openstudio-rserve -f diff --git a/local_setup_scripts/win64/rebuild_sr.sh b/local_setup_scripts/win64/rebuild_sr.sh index 4caad2eca..2041f8ffa 100644 --- a/local_setup_scripts/win64/rebuild_sr.sh +++ b/local_setup_scripts/win64/rebuild_sr.sh @@ -6,7 +6,7 @@ sleep 5 docker volume rm -f osdata || true docker volume rm -f dbdata || true docker image rm 127.0.0.1:5000/openstudio-server -f -docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.6.0 +docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.6.1 docker push 127.0.0.1:5000/openstudio-server cd docker/R #docker image rm 127.0.0.1:5000/openstudio-rserve -f diff --git a/local_setup_scripts/win64/rebuild_sr_no_rm.sh b/local_setup_scripts/win64/rebuild_sr_no_rm.sh index 19ca2d9b8..204dbef8a 100644 --- a/local_setup_scripts/win64/rebuild_sr_no_rm.sh +++ b/local_setup_scripts/win64/rebuild_sr_no_rm.sh @@ -6,7 +6,7 @@ sleep 5 docker volume rm -f osdata || true docker volume rm -f dbdata || true #docker image rm 127.0.0.1:5000/openstudio-server -f -docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.6.0 +docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.6.1 docker push 127.0.0.1:5000/openstudio-server cd docker/R #docker image rm 127.0.0.1:5000/openstudio-rserve -f diff --git a/server/app/lib/openstudio_server/version.rb b/server/app/lib/openstudio_server/version.rb index 10d2d7dae..238b8f6d9 100644 --- a/server/app/lib/openstudio_server/version.rb +++ b/server/app/lib/openstudio_server/version.rb @@ -34,9 +34,9 @@ # ******************************************************************************* module OpenstudioServer - VERSION = '3.6.0'.freeze + VERSION = '3.6.1'.freeze # format should be ^.*\-{1}[a-z]+[0-9]+ # for example: -rc1, -beta6, -customusecase0 VERSION_EXT = ''.freeze # with preceding - or + - OS_SHA = '860f5de185'.freeze + OS_SHA = 'bb9481519e'.freeze end