diff --git a/.github/workflows/openstudio-server-tests.yml b/.github/workflows/openstudio-server-tests.yml index e079d4b8e..9cb100281 100644 --- a/.github/workflows/openstudio-server-tests.yml +++ b/.github/workflows/openstudio-server-tests.yml @@ -11,8 +11,8 @@ on: [push, pull_request] env: USE_TESTING_TIMEOUTS: "true" OPENSTUDIO_VERSION: 3.9.0 - OPENSTUDIO_VERSION_SHA: cc1e0bbd6d - OPENSTUDIO_VERSION_EXT: "-rc2" + OPENSTUDIO_VERSION_SHA: a000d0ea29 + OPENSTUDIO_VERSION_EXT: "-rc3" DOCKER_COMPOSE_VERSION: 1.21.1 BUNDLE_WITHOUT: native_ext @@ -127,7 +127,7 @@ jobs: if: | github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || - github.ref == 'refs/heads/3.9.0-rc1' + github.ref == 'refs/heads/3.9.0-rc3' 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 index 4aa752ba1..62cb8af81 100644 --- a/.github/workflows/security-scan.yml +++ b/.github/workflows/security-scan.yml @@ -11,8 +11,8 @@ on: [push, pull_request] env: USE_TESTING_TIMEOUTS: "true" OPENSTUDIO_VERSION: 3.9.0 - OPENSTUDIO_VERSION_SHA: cc1e0bbd6d - OPENSTUDIO_VERSION_EXT: "-rc2" + OPENSTUDIO_VERSION_SHA: a000d0ea29 + OPENSTUDIO_VERSION_EXT: "-rc3" DOCKER_COMPOSE_VERSION: 1.21.1 BUNDLE_WITHOUT: native_ext diff --git a/Dockerfile b/Dockerfile index 309097bcc..d6260d49f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ #may include suffix ARG OPENSTUDIO_VERSION=3.9.0 -FROM nrel/openstudio:dev-3.9.0-rc1 as base +FROM nrel/openstudio:dev-3.9.0-rc3 as base MAINTAINER Nicholas Long nicholas.long@nrel.gov ENV DEBIAN_FRONTEND=noninteractive diff --git a/appveyor.yml b/appveyor.yml index bcb08c579..80316caeb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,8 +5,8 @@ image: Visual Studio 2019 environment: USE_TESTING_TIMEOUTS: "true" OPENSTUDIO_VERSION: 3.9.0 - OPENSTUDIO_VERSION_SHA: cc1e0bbd6d - OPENSTUDIO_VERSION_EXT: "-rc2" + OPENSTUDIO_VERSION_SHA: a000d0ea29 + OPENSTUDIO_VERSION_EXT: "-rc3" OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe BUILD_TYPE: "test" SKIP_COVERALLS: "true" diff --git a/local_setup_scripts/win64/rebuild_sr.sh b/local_setup_scripts/win64/rebuild_sr.sh index df832deab..bbfc929ce 100644 --- a/local_setup_scripts/win64/rebuild_sr.sh +++ b/local_setup_scripts/win64/rebuild_sr.sh @@ -6,11 +6,11 @@ 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.8.0 +docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.9.0 docker push 127.0.0.1:5000/openstudio-server cd docker/R docker image rm 127.0.0.1:5000/openstudio-rserve -f -docker build --no-cache . -t="127.0.0.1:5000/openstudio-rserve" +docker build . -t="127.0.0.1:5000/openstudio-rserve" docker push 127.0.0.1:5000/openstudio-rserve docker pull mongo:6.0.7 docker tag mongo:6.0.7 127.0.0.1:5000/mongo diff --git a/server/app/lib/openstudio_server/version.rb b/server/app/lib/openstudio_server/version.rb index 18ad7e005..fd683f6fd 100644 --- a/server/app/lib/openstudio_server/version.rb +++ b/server/app/lib/openstudio_server/version.rb @@ -7,6 +7,6 @@ module OpenstudioServer VERSION = '3.9.0'.freeze # format should be ^.*\-{1}[a-z]+[0-9]+ # for example: -rc1, -beta6, -customusecase0 - VERSION_EXT = '-rc2'.freeze # with preceding - or + - OS_SHA = 'cc1e0bbd6d'.freeze + VERSION_EXT = '-rc3'.freeze # with preceding - or + + OS_SHA = 'a000d0ea29'.freeze end