Merge pull request #568 from NREL/v3.0.1-rc1

Updating OpenStudio to 3.0.1-rc1
NREL · Jun 5, 2020 · f1b8acb · f1b8acb
2 parents 341b93d + 79dc4c2
commit f1b8acb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git 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=1c9617fa4e OPENSTUDIO_VERSION_EXT=""
+    - OPENSTUDIO_VERSION=3.0.1 OPENSTUDIO_VERSION_SHA=13374833e2 OPENSTUDIO_VERSION_EXT="-rc1"
     - DOCKER_COMPOSE_VERSION=1.21.1
     - BUNDLE_WITHOUT=native_ext
 

diff --git 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
+ARG OPENSTUDIO_VERSION=3.0.1
 FROM nrel/openstudio:$OPENSTUDIO_VERSION as base
 MAINTAINER Nicholas Long nicholas.long@nrel.gov
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,9 +2,9 @@ version: 1.0.{build}-{branch}
 
 environment:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.0.0
-  OPENSTUDIO_VERSION_SHA: 1c9617fa4e
-  OPENSTUDIO_VERSION_EXT: ""
+  OPENSTUDIO_VERSION: 3.0.1
+  OPENSTUDIO_VERSION_SHA: 13374833e2
+  OPENSTUDIO_VERSION_EXT: "-rc1"
   OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe
   RUBY_VERSION: 25-x64
   BUNDLER_VERSION: 2.1.0

diff --git a/ci/travis/install_openstudio.sh b/ci/travis/install_openstudio.sh
@@ -15,7 +15,7 @@ if [ ! -z ${OPENSTUDIO_VERSION} ] && [ ! -z ${OPENSTUDIO_SHA} ]; then
 
     # copying this from the docker-openstudio dockerfile
     apt-get update && apt-get install -y curl vim gdebi-core ruby2.5 ruby-dev libffi-dev build-essential zlib1g-dev vim git locales sudo
-    export OPENSTUDIO_DOWNLOAD_URL=https://openstudio-builds.s3.amazonaws.com/3.0.0/$OPENSTUDIO_DOWNLOAD_FILENAME
+    export OPENSTUDIO_DOWNLOAD_URL=https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}/$OPENSTUDIO_DOWNLOAD_FILENAME
 
     echo "OpenStudio Package Download URL is ${OPENSTUDIO_DOWNLOAD_URL}"
     curl -SLO $OPENSTUDIO_DOWNLOAD_URL

diff --git a/server/Gemfile b/server/Gemfile
@@ -70,7 +70,8 @@ gem 'openstudio-analysis', '= 1.0.3'
 
 gem 'openstudio-aws', '0.7.1'
 
-gem 'libxml-ruby'
+#libxml 3.2.0 failing on windows
+gem 'libxml-ruby', '3.1.0'
 gem 'msgpack', '~> 1.0'
 gem 'multi_json'
 gem 'rest-client', '~>2.0.1' 

diff --git a/server/app/lib/openstudio_server/version.rb b/server/app/lib/openstudio_server/version.rb
@@ -34,9 +34,9 @@
 # *******************************************************************************
 
 module OpenstudioServer
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
   # format should be ^.*\-{1}[a-z]+[0-9]+
   # for example: -rc1, -beta6, -customusecase0
-  VERSION_EXT = ''.freeze # with preceding - or +
-  OS_SHA = '1c9617fa4e'
+  VERSION_EXT = '-rc1'.freeze # with preceding - or +
+  OS_SHA = '13374833e2'
 end