Skip to content

Commit

Permalink
Merge pull request #2386 from NREL/update_standards_gem
Browse files Browse the repository at this point in the history 
Updates openstudio-standards to 0.1.8 to fix issue hit during PSD tra…
  • Loading branch information
@evanweaver
evanweaver authored Oct 26, 2016
2 parents 6cfd411 + 1b45ea4 commit 6103d54
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions DarwinPostFlight.sh.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ ln -sf "$2/Applications/${CMAKE_PROJECT_NAME} ${OPENSTUDIO_VERSION}/Ruby/openstu
ln -sFf "$2/Applications/${CMAKE_PROJECT_NAME} ${OPENSTUDIO_VERSION}/Ruby/openstudio" /Library/Ruby/Site/

#---------- Create Symbolic Links to the openstudio-standards gem ----------
ln -sFf "$2/Applications/${CMAKE_PROJECT_NAME} ${OPENSTUDIO_VERSION}/ruby-2.0.0-aws-Darwin/lib/ruby/gems/2.0.0/gems/openstudio-standards-0.1.7" /Library/Ruby/Gems/2.0.0/gems/
ln -sf "$2/Applications/${CMAKE_PROJECT_NAME} ${OPENSTUDIO_VERSION}/ruby-2.0.0-aws-Darwin/lib/ruby/gems/2.0.0/specifications/openstudio-standards-0.1.7.gemspec" /Library/Ruby/Gems/2.0.0/specifications/
ln -sFf "$2/Applications/${CMAKE_PROJECT_NAME} ${OPENSTUDIO_VERSION}/ruby-2.0.0-aws-Darwin/lib/ruby/gems/2.0.0/gems/openstudio-standards-0.1.8" /Library/Ruby/Gems/2.0.0/gems/
ln -sf "$2/Applications/${CMAKE_PROJECT_NAME} ${OPENSTUDIO_VERSION}/ruby-2.0.0-aws-Darwin/lib/ruby/gems/2.0.0/specifications/openstudio-standards-0.1.8.gemspec" /Library/Ruby/Gems/2.0.0/specifications/

#---------- Write a plugin-config.rb file for later installation ----------
# And put it in the install folder for later reuse by the user if needed
Expand Down
2 changes: 1 addition & 1 deletion dependencies/ruby/Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ gem 'test-unit', '= 2.0.0.0'

# OpenStudio
gem 'openstudio-aws', '~> 0.4.0.pre1'
gem 'openstudio-standards', '= 0.1.7' # Also update DarwinPostFlight.sh.in when updating gem version
gem 'openstudio-standards', '= 0.1.8' # Also update DarwinPostFlight.sh.in when updating gem version
4 changes: 2 additions & 2 deletions dependencies/ruby/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GEM
net-scp (~> 1.1)
semantic (~> 1.4)
sshkey (~> 1.7)
openstudio-standards (0.1.7)
openstudio-standards (0.1.8)
rake (0.9.6)
rdoc (4.0.0)
semantic (1.4.1)
Expand All @@ -31,7 +31,7 @@ PLATFORMS

DEPENDENCIES
openstudio-aws (~> 0.4.0.pre1)
openstudio-standards (= 0.1.7)
openstudio-standards (= 0.1.8)
rake (= 0.9.6)
rdoc (= 4.0.0)
test-unit (= 2.0.0.0)
Expand Down

8 comments on commit 6103d54

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (evanweaver) - x86_64-Linux-Ubuntu-14.04-clang-3.5: Build Failed

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (evanweaver) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (evanweaver) - x86_64-Linux-Ubuntu-14.04-clang-3.5: Build Failed

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (evanweaver) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (evanweaver) - i386-Windows-7-VisualStudio-12: Tests Failed (2070 of 2504 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (evanweaver) - Win64-Windows-7-VisualStudio-12: OK (2317 of 2504 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (evanweaver) - i386-Windows-7-VisualStudio-12: Tests Failed (2070 of 2504 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (evanweaver) - Win64-Windows-7-VisualStudio-12: OK (2314 of 2504 tests passed, 0 test warnings)

Build Badge Test Badge

Please sign in to comment.