Skip to content

Commit

Permalink
Update to 3.2.1 SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
tijcolem committed Jun 25, 2021
1 parent 4111507 commit e53998b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/openstudio-server-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ on: [push, pull_request]
env:
USE_TESTING_TIMEOUTS: "true"
OPENSTUDIO_VERSION: 3.2.1
OPENSTUDIO_VERSION_SHA: deb57b3585
OPENSTUDIO_VERSION_EXT: "-rc1"
OPENSTUDIO_VERSION_SHA: bdbdbc9da6
OPENSTUDIO_VERSION_EXT: ""
DOCKER_COMPOSE_VERSION: 1.21.1
BUNDLE_WITHOUT: native_ext

Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
- name: docker
shell: bash
run: |
export OPENSTUDIO_TAG=3.2.1-rc1
export OPENSTUDIO_TAG=3.2.1
sed -i -E "s/.git//g" .dockerignore
docker volume create --name=osdata
docker images --all
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ image: Visual Studio 2019
environment:
USE_TESTING_TIMEOUTS: "true"
OPENSTUDIO_VERSION: 3.2.1
OPENSTUDIO_VERSION_SHA: deb57b3585
OPENSTUDIO_VERSION_EXT: "-rc1"
OPENSTUDIO_VERSION_SHA: bdbdbc9da6
OPENSTUDIO_VERSION_EXT: ""
OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe
BUILD_TYPE: "test"
SKIP_COVERALLS: "true"
Expand Down
2 changes: 1 addition & 1 deletion ci/appveyor/setup.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ REM install develop build
set OS_INSTALL_NAME=OpenStudio-%OPENSTUDIO_VERSION%%OPENSTUDIO_VERSION_EXT%%%2B%OPENSTUDIO_VERSION_SHA%-Windows.exe
echo Install name is %OS_INSTALL_NAME%
REM curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/%OPENSTUDIO_VERSION%/%OS_INSTALL_NAME%
curl -SLO --insecure https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/3.2.1-rc/signed/%OS_INSTALL_NAME%
curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/3.2.1/%OS_INSTALL_NAME%
dir .
REM Install OpenStudio
%OS_INSTALL_NAME% --script ci/appveyor/install-windows.qs
Expand Down
2 changes: 1 addition & 1 deletion ci/github-actions/install_openstudio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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 libgmp-dev libffi-dev build-essential zlib1g-dev vim git locales sudo
#export OPENSTUDIO_DOWNLOAD_URL=https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}/$OPENSTUDIO_DOWNLOAD_FILENAME
export OPENSTUDIO_DOWNLOAD_URL=https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/3.2.1-rc/$OPENSTUDIO_DOWNLOAD_FILENAME
export OPENSTUDIO_DOWNLOAD_URL=https://openstudio-builds.s3.amazonaws.com/3.2.1/$OPENSTUDIO_DOWNLOAD_FILENAME

echo "OpenStudio Package Download URL is ${OPENSTUDIO_DOWNLOAD_URL}"
curl -SLO $OPENSTUDIO_DOWNLOAD_URL
Expand Down
2 changes: 1 addition & 1 deletion ci/github-actions/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ else
export OS_NAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}%2B${OPENSTUDIO_VERSION_SHA}-Darwin
export OS_NAME_WITH_PLUS=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}+${OPENSTUDIO_VERSION_SHA}-Darwin
#curl -SL --insecure https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz
curl -SL --insecure https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/3.2.1-rc/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz
curl -SL --insecure https://openstudio-builds.s3.amazonaws.com/3.2.1/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz
# OSX downloads with %2B but installs with + sign. These are the encoded chars in url strings.
#hdiutil attach ${OS_NAME}.dmg
#sed -i -e "s|REPLACEME|$HOME/openstudio|" ci/github-actions/install-mac.qs
Expand Down
4 changes: 2 additions & 2 deletions server/app/lib/openstudio_server/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ module OpenstudioServer
VERSION = '3.2.1'.freeze
# format should be ^.*\-{1}[a-z]+[0-9]+
# for example: -rc1, -beta6, -customusecase0
VERSION_EXT = '-rc1'.freeze # with preceding - or +
OS_SHA = 'deb57b3585'.freeze
VERSION_EXT = ''.freeze # with preceding - or +
OS_SHA = 'bdbdbc9da6'.freeze
end

0 comments on commit e53998b

Please sign in to comment.