Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove hardcoded openstudio version and sha #564

Merged
merged 1 commit into from
May 12, 2020
+16 −15
Merged

Remove hardcoded openstudio version and sha #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ci/appveyor/setup.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
set PATH=C:\Program Files\Git\mingw64\bin;C:\projects\openstudio\bin;%PATH%
set GEM_HOME=C:\projects\openstudio-server\gems
set GEM_PATH=C:\projects\openstudio-server\gems;C:\projects\openstudio-server\gems\gems\bundler\gems
echo Downloading and Installing OpenStudio (develop branch, %OPENSTUDIO_VERSION%%OPENSTUDIO_VERSION_EXT%.%OPENSTUDIO_VERSION_SHA%)
REM install develop build
curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/3.0.0/OpenStudio-3.0.0%%2B1c9617fa4e-Windows.exe
OpenStudio-3.0.0%%2B1c9617fa4e-Windows.exe --script ci/appveyor/install-windows.qs
echo Downloading and Installing OpenStudio (develop branch, %OPENSTUDIO_VERSION%%OPENSTUDIO_VERSION_EXT%+%OPENSTUDIO_VERSION_SHA%)
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%
curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/%OPENSTUDIO_VERSION%/%OS_INSTALL_NAME%
dir .
%OS_INSTALL_NAME% --script ci/appveyor/install-windows.qs
move C:\openstudio C:\projects\openstudio
dir C:\projects\openstudio
dir C:\projects\openstudio\Ruby
Expand Down
8 changes: 2 additions & 6 deletions ci/travis/install_openstudio.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,9 @@ OPENSTUDIO_VERSION_EXT=$3

if [ ! -z ${OPENSTUDIO_VERSION} ] && [ ! -z ${OPENSTUDIO_SHA} ]; then
# OPENSTUDIO_VERSION_EXT may be empty
#OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-$OPENSTUDIO_VERSION$OPENSTUDIO_VERSION_EXT.$OPENSTUDIO_SHA-Linux.deb
# Dev3 hardcoding:
OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-3.0.0%2B1c9617fa4e-Linux.deb

OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}%2B${OPENSTUDIO_SHA}-Linux.deb
echo "Installing OpenStudio ${OPENSTUDIO_DOWNLOAD_FILENAME}"

OPENSTUDIO_DOWNLOAD_BASE_URL=https://openstudio-builds.s3.amazonaws.com/3.0.0/
OPENSTUDIO_DOWNLOAD_BASE_URL=https://openstudio-builds.s3.amazonaws.com/3${OPENSTUDIO_VERSION}/
OPENSTUDIO_DOWNLOAD_URL=$OPENSTUDIO_DOWNLOAD_BASE_URL/$OPENSTUDIO_DOWNLOAD_FILENAME

# copying this from the docker-openstudio dockerfile
Expand Down
12 changes: 7 additions & 5 deletions ci/travis/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,16 @@ else
cp mongodb-osx-x86_64-3.4.18/bin/* /usr/local/bin/

# Install openstudio -- Use the install script that is in this repo now, the one on OpenStudio/develop has changed
curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/3.0.0/OpenStudio-3.0.0%2B1c9617fa4e-Darwin.dmg
# OSX downloads with %2B. These are unsafe chars in url strings
hdiutil attach OpenStudio-3.0.0%2B1c9617fa4e-Darwin.dmg
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 -SLO --insecure https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}/${OS_NAME}.dmg
# 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/travis/install-mac.qs
rm -rf $HOME/openstudio
# Will install into $HOME/openstudio and RUBYLIB will be $HOME/openstudio/Ruby
sudo /Volumes/OpenStudio-3.0.0+1c9617fa4e-Darwin/OpenStudio-3.0.0+1c9617fa4e-Darwin.app/Contents/MacOS/OpenStudio-3.0.0+1c9617fa4e-Darwin --script ci/travis/install-mac.qs
hdiutil detach /Volumes/OpenStudio-3.0.0+1c9617fa4e -force
sudo /Volumes/${OS_NAME_WITH_PLUS}/${OS_NAME_WITH_PLUS}.app/Contents/MacOS/${OS_NAME_WITH_PLUS} --script ci/travis/install-mac.qs
hdiutil detach /Volumes/${OS_NAME_WITH_PLUS} -force

export PATH="$TRAVIS_BUILD_DIR/gems/bin:/usr/local/opt/[email protected]/bin:$HOME/openstudio/bin:$PATH"
export RUBYLIB="$HOME/openstudio/Ruby"
Expand Down