Skip to content

Commit e7b25ac

Browse files
committed
Merge branch 'develop'
2 parents 4b41713 + 4a799db commit e7b25ac

5 files changed

Lines changed: 13 additions & 17 deletions

File tree

.github/workflows/test.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ jobs:
2323

2424
- name: install openstudio
2525
run: |
26-
wget http://openstudio-ci-builds.s3-website-us-west-2.amazonaws.com/PR-5149/OpenStudio-3.8.0-beta%2B2bc25028a3-Ubuntu-22.04-x86_64.deb
26+
wget https://github.com/NREL/OpenStudio/releases/download/v3.9.0/OpenStudio-3.9.0+c77fbb9569-Ubuntu-22.04-x86_64.deb
2727
sudo apt-get -qq install -y ./OpenStudio*.deb
2828
rm -Rf ./OpenStudio*.deb
2929
3030
- uses: ruby/setup-ruby@v1
3131
with:
3232
ruby-version: '3.2.2' # Not needed with a .ruby-version file
33-
bundler: '2.5.5'
33+
bundler: '2.4.10'
3434
bundler-cache: true # runs 'bundle install' and caches installed gems automatically. We should NOT change the Bundler path, because to perform caching, this action will use bundle config --local path $PWD/vendor/bundle.
3535
env:
36-
RUBYLIB: /usr/local/openstudio-3.8.0/Ruby
36+
RUBYLIB: /usr/local/openstudio-3.9.0/Ruby
3737

3838
- name: show enviroment
3939
shell: bash
@@ -66,7 +66,6 @@ jobs:
6666
ruby -e "require 'openstudio'; puts OpenStudio::openStudioLongVersion"
6767
echo "::endgroup::"
6868
69-
7069
- name: test
7170
shell: bash
7271
run: |

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
OpenStudio::Workflow Change Log
22
==================================
33

4+
Version 2.5.0
5+
-------------
6+
* openstudio 3.10
7+
48
Version 2.4.0
59
-------------
610
* Minimum Ruby version upgraded to 3.2.2

Jenkinsfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

lib/openstudio/workflow/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77

88
module OpenStudio
99
module Workflow
10-
VERSION = '2.4.0' # Suffixes must have periods (not dashes)
10+
VERSION = '2.5.0' # Suffixes must have periods (not dashes)
1111
end
1212
end

openstudio-workflow.gemspec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@ Gem::Specification.new do |s|
2626
s.add_development_dependency 'ci_reporter', '~> 2.1.0'
2727
s.add_development_dependency 'ci_reporter_rspec', '~> 1.0.0'
2828
s.add_development_dependency 'coveralls', '~> 0.8.21'
29-
s.add_development_dependency 'json-schema', '~> 2.8.0'
30-
s.add_development_dependency 'openstudio_measure_tester', '~> 0.4.0'
29+
s.add_development_dependency 'json-schema', '~> 4'
30+
s.add_development_dependency 'openstudio_measure_tester', '~> 0.5.0'
3131
s.add_development_dependency 'parallel', '~> 1.19.1'
3232
s.add_development_dependency 'public_suffix', '~> 4.0.3'
3333
s.add_development_dependency 'rainbow', '~> 3.0.0'
3434
s.add_development_dependency 'rake', '~> 13.0'
3535
s.add_development_dependency 'rspec', '~> 3.9'
36+
s.add_development_dependency 'rubocop', '~> 1.50'
37+
s.add_development_dependency 'openstudio-standards', '~> 0.7.0'
38+
s.add_development_dependency 'zip', '~> 2'
3639
end

0 commit comments

Comments
 (0)