Merge 55d44f9 into f1b8acb

NREL · Jun 21, 2020 · 65d64e2 · 65d64e2
2 parents f1b8acb + 55d44f9
commit 65d64e2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 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.1 OPENSTUDIO_VERSION_SHA=13374833e2 OPENSTUDIO_VERSION_EXT="-rc1"
+    - OPENSTUDIO_VERSION=3.0.1 OPENSTUDIO_VERSION_SHA=7de76c9b4e OPENSTUDIO_VERSION_EXT="-rc2"
     - DOCKER_COMPOSE_VERSION=1.21.1
     - BUNDLE_WITHOUT=native_ext
 

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

diff --git 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.1'.freeze
   # format should be ^.*\-{1}[a-z]+[0-9]+
   # for example: -rc1, -beta6, -customusecase0
-  VERSION_EXT = '-rc1'.freeze # with preceding - or +
-  OS_SHA = '13374833e2'
+  VERSION_EXT = '-rc2'.freeze # with preceding - or +
+  OS_SHA = '7de76c9b4e'
 end