OS 3.9.0-rc1

NREL · Nov 4, 2024 · 871f089 · 871f089
1 parent 0578b0b
commit 871f089
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/.github/workflows/openstudio-server-tests.yml b/.github/workflows/openstudio-server-tests.yml
@@ -10,9 +10,9 @@ on: [push, pull_request]
 
 env:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.8.0
-  OPENSTUDIO_VERSION_SHA: f953b6fcaf
-  OPENSTUDIO_VERSION_EXT: ""
+  OPENSTUDIO_VERSION: 3.9.0
+  OPENSTUDIO_VERSION_SHA: cc1e0bbd6d
+  OPENSTUDIO_VERSION_EXT: "-rc2"
   DOCKER_COMPOSE_VERSION: 1.21.1
   BUNDLE_WITHOUT: native_ext
 
@@ -101,7 +101,7 @@ jobs:
     - name: docker
       shell: bash 
       run: |
-          export OPENSTUDIO_TAG=3.8.0
+          export OPENSTUDIO_TAG=3.9.0
           sed -i -E "s/.git//g" .dockerignore
           docker volume create --name=osdata
           docker images --all
@@ -127,7 +127,7 @@ jobs:
       if: | 
         github.ref == 'refs/heads/master' || 
         github.ref == 'refs/heads/develop'
-      #  github.ref == 'refs/heads/3.6.1-3'
+      #  github.ref == 'refs/heads/3.9.0'
       shell: bash
       run: ./docker/deployment/scripts/deploy_docker_github_actions.sh
       env: 

diff --git a/.github/workflows/security-scan.yml b/.github/workflows/security-scan.yml
@@ -10,9 +10,9 @@ on: [push, pull_request]
 
 env:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.8.0
-  OPENSTUDIO_VERSION_SHA: f953b6fcaf
-  OPENSTUDIO_VERSION_EXT: ""
+  OPENSTUDIO_VERSION: 3.9.0
+  OPENSTUDIO_VERSION_SHA: cc1e0bbd6d
+  OPENSTUDIO_VERSION_EXT: "-rc2"
   DOCKER_COMPOSE_VERSION: 1.21.1
   BUNDLE_WITHOUT: native_ext
 
@@ -31,7 +31,7 @@ jobs:
     - name: docker
       shell: bash 
       run: |
-          export OPENSTUDIO_TAG=3.8.0
+          export OPENSTUDIO_TAG=3.9.0
           sed -i -E "s/.git//g" .dockerignore
           docker volume create --name=osdata
           docker images --all

diff --git 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.8.0
-FROM nrel/openstudio:3.8.0 as base
+ARG OPENSTUDIO_VERSION=3.9.0
+FROM nrel/openstudio:dev-3.9.0-rc1 as base
 MAINTAINER Nicholas Long [email protected]
 
 ENV DEBIAN_FRONTEND=noninteractive

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,9 +4,9 @@ image: Visual Studio 2019
 
 environment:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.8.0
-  OPENSTUDIO_VERSION_SHA: f953b6fcaf
-  OPENSTUDIO_VERSION_EXT: ""
+  OPENSTUDIO_VERSION: 3.9.0
+  OPENSTUDIO_VERSION_SHA: cc1e0bbd6d
+  OPENSTUDIO_VERSION_EXT: "-rc2"
   OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe
   BUILD_TYPE: "test"
   SKIP_COVERALLS: "true"

diff --git a/server/Gemfile b/server/Gemfile
@@ -7,6 +7,7 @@ ruby '~>3.2.0'
 # gem 'rubygems-update', '2.7.8'
 
 gem 'rails', '~> 6.1.3'
+gem 'webrick', '~> 1.8.2'
 gem 'rake', '~> 13.0'
 
 # added for support of the project rakefile

diff --git a/server/app/lib/openstudio_server/version.rb b/server/app/lib/openstudio_server/version.rb
@@ -4,9 +4,9 @@
 # *******************************************************************************
 
 module OpenstudioServer
-  VERSION = '3.8.0'.freeze
+  VERSION = '3.9.0'.freeze
   # format should be ^.*\-{1}[a-z]+[0-9]+
   # for example: -rc1, -beta6, -customusecase0
-  VERSION_EXT = '-rc3'.freeze # with preceding - or +
-  OS_SHA = 'd8eac889d0'.freeze
+  VERSION_EXT = '-rc2'.freeze # with preceding - or +
+  OS_SHA = 'cc1e0bbd6d'.freeze
 end