From d42d11e0b3b4e0249c7de45e0fae5a1dcfa0940b Mon Sep 17 00:00:00 2001 From: tijcolem Date: Tue, 14 Apr 2020 14:03:56 -0600 Subject: [PATCH 1/2] update to v3.0.0-rc3 --- Dockerfile | 2 +- appveyor.yml | 4 ++-- ci/appveyor/setup.cmd | 4 ++-- ci/travis/install_openstudio.sh | 2 +- ci/travis/setup.sh | 8 ++++---- server/app/lib/openstudio_server/version.rb | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 74eca0efc..7e1058d47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # NOTES: Currently this is one big dockerfile and non-optimal. #may include suffix -ARG OPENSTUDIO_VERSION=3.0.0-rc2 +ARG OPENSTUDIO_VERSION=3.0.0-rc3 FROM nrel/openstudio:$OPENSTUDIO_VERSION as base MAINTAINER Nicholas Long nicholas.long@nrel.gov diff --git a/appveyor.yml b/appveyor.yml index c37351040..ea204f795 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,8 +3,8 @@ version: 1.0.{build}-{branch} environment: USE_TESTING_TIMEOUTS: "true" OPENSTUDIO_VERSION: 3.0.0 - OPENSTUDIO_VERSION_SHA: c1a45f4753 - OPENSTUDIO_VERSION_EXT: -rc2 + OPENSTUDIO_VERSION_SHA: 949b904134 + OPENSTUDIO_VERSION_EXT: -rc3 OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe RUBY_VERSION: 25-x64 BUNDLER_VERSION: 2.1.0 diff --git a/ci/appveyor/setup.cmd b/ci/appveyor/setup.cmd index cbd5b0f7d..f94922bae 100644 --- a/ci/appveyor/setup.cmd +++ b/ci/appveyor/setup.cmd @@ -3,8 +3,8 @@ set GEM_HOME=C:\projects\openstudio-server\gems set GEM_PATH=C:\projects\openstudio-server\gems;C:\projects\openstudio-server\gems\gems\bundler\gems echo Downloading and Installing OpenStudio (develop branch, %OPENSTUDIO_VERSION%%OPENSTUDIO_VERSION_EXT%.%OPENSTUDIO_VERSION_SHA%) REM install develop build -curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/3.0.0/OpenStudio-3.0.0-rc2%%2Bc1a45f4753-Windows.exe -OpenStudio-3.0.0-rc2%%2Bc1a45f4753-Windows.exe --script ci/appveyor/install-windows.qs +curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/3.0.0/OpenStudio-3.0.0-rc3%%2B949b904134-Windows.exe +OpenStudio-3.0.0-rc3%%2B949b904134-Windows.exe --script ci/appveyor/install-windows.qs move C:\openstudio C:\projects\openstudio dir C:\projects\openstudio dir C:\projects\openstudio\Ruby diff --git a/ci/travis/install_openstudio.sh b/ci/travis/install_openstudio.sh index 4886e1bda..fc1b889d9 100755 --- a/ci/travis/install_openstudio.sh +++ b/ci/travis/install_openstudio.sh @@ -10,7 +10,7 @@ if [ ! -z ${OPENSTUDIO_VERSION} ] && [ ! -z ${OPENSTUDIO_SHA} ]; then # OPENSTUDIO_VERSION_EXT may be empty #OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-$OPENSTUDIO_VERSION$OPENSTUDIO_VERSION_EXT.$OPENSTUDIO_SHA-Linux.deb # Dev3 hardcoding: - OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-3.0.0-rc2%2Bc1a45f4753-Linux.deb + OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-3.0.0-rc3%2B949b904134-Linux.deb echo "Installing OpenStudio ${OPENSTUDIO_DOWNLOAD_FILENAME}" diff --git a/ci/travis/setup.sh b/ci/travis/setup.sh index 2456b993f..e1b2476ee 100755 --- a/ci/travis/setup.sh +++ b/ci/travis/setup.sh @@ -26,14 +26,14 @@ else cp mongodb-osx-x86_64-3.4.18/bin/* /usr/local/bin/ # Install openstudio -- Use the install script that is in this repo now, the one on OpenStudio/develop has changed - curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/3.0.0/OpenStudio-3.0.0-rc2%2Bc1a45f4753-Darwin.dmg + curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/3.0.0/OpenStudio-3.0.0-rc3%2B949b904134-Darwin.dmg # OSX downloads with %2B. These are unsafe chars in url strings - hdiutil attach OpenStudio-3.0.0-rc2%2Bc1a45f4753-Darwin.dmg + hdiutil attach OpenStudio-3.0.0-rc3%2B949b904134-Darwin.dmg sed -i -e "s|REPLACEME|$HOME/openstudio|" ci/travis/install-mac.qs rm -rf $HOME/openstudio # Will install into $HOME/openstudio and RUBYLIB will be $HOME/openstudio/Ruby - sudo /Volumes/OpenStudio-3.0.0-rc2+c1a45f4753-Darwin/OpenStudio-3.0.0-rc2+c1a45f4753-Darwin.app/Contents/MacOS/OpenStudio-3.0.0-rc2+c1a45f4753-Darwin --script ci/travis/install-mac.qs - hdiutil detach /Volumes/OpenStudio-3.0.0-rc2+c1a45f4753 -force + sudo /Volumes/OpenStudio-3.0.0-rc3+949b904134-Darwin/OpenStudio-3.0.0-rc3+949b904134-Darwin.app/Contents/MacOS/OpenStudio-3.0.0-rc3+949b904134-Darwin --script ci/travis/install-mac.qs + hdiutil detach /Volumes/OpenStudio-3.0.0-rc3+949b904134 -force export PATH="$TRAVIS_BUILD_DIR/gems/bin:/usr/local/opt/ruby@2.5/bin:$HOME/openstudio/bin:$PATH" export RUBYLIB="$HOME/openstudio/Ruby" diff --git a/server/app/lib/openstudio_server/version.rb b/server/app/lib/openstudio_server/version.rb index 4babe26a3..222e8bab3 100644 --- a/server/app/lib/openstudio_server/version.rb +++ b/server/app/lib/openstudio_server/version.rb @@ -37,6 +37,6 @@ module OpenstudioServer VERSION = '3.0.0'.freeze # format should be ^.*\-{1}[a-z]+[0-9]+ # for example: -rc1, -beta6, -customusecase0 - VERSION_EXT = '-rc2'.freeze # with preceding - or + - OS_SHA = 'c1a45f4753' + VERSION_EXT = '-rc3'.freeze # with preceding - or + + OS_SHA = '949b904134' end From 805086a71bbaeced311a3002d0e79841810e9118 Mon Sep 17 00:00:00 2001 From: tijcolem Date: Tue, 14 Apr 2020 14:10:17 -0600 Subject: [PATCH 2/2] update travis for v3.0.0-rc3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e43a97e40..1196842f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ language: minimal env: global: - USE_TESTING_TIMEOUTS: "true" - - OPENSTUDIO_VERSION=3.0.0 OPENSTUDIO_VERSION_SHA=c1a45f4753 OPENSTUDIO_VERSION_EXT=-rc2 + - OPENSTUDIO_VERSION=3.0.0 OPENSTUDIO_VERSION_SHA=949b904134 OPENSTUDIO_VERSION_EXT=-rc3 - DOCKER_COMPOSE_VERSION=1.21.1 - BUNDLE_WITHOUT=native_ext