From 65e833c71b059e9996a53f595fb7b17ebbf95b0e Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Thu, 20 Mar 2025 09:34:18 +0100 Subject: [PATCH 1/8] Use 3.9.0 + align bundler version --- .github/workflows/test.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4b65c39..48d17ef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,17 +23,17 @@ jobs: - name: install openstudio run: | - 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 + wget https://github.com/NREL/OpenStudio/releases/download/v3.9.0/OpenStudio-3.9.0+c77fbb9569-Ubuntu-22.04-x86_64.deb sudo apt-get -qq install -y ./OpenStudio*.deb rm -Rf ./OpenStudio*.deb - uses: ruby/setup-ruby@v1 with: ruby-version: '3.2.2' # Not needed with a .ruby-version file - bundler: '2.5.5' + bundler: '2.4.10' 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. env: - RUBYLIB: /usr/local/openstudio-3.8.0/Ruby + RUBYLIB: /usr/local/openstudio-3.9.0/Ruby - name: show enviroment shell: bash @@ -66,7 +66,6 @@ jobs: ruby -e "require 'openstudio'; puts OpenStudio::openStudioLongVersion" echo "::endgroup::" - - name: test shell: bash run: | From a4664b46fb4ef44da4ce2886a4d7f2fcecdd1c11 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Thu, 20 Mar 2025 09:52:26 +0100 Subject: [PATCH 2/8] Add openstudio-standards, since some tests use measure that use it --- openstudio-workflow.gemspec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openstudio-workflow.gemspec b/openstudio-workflow.gemspec index 0715fe8..4810a18 100644 --- a/openstudio-workflow.gemspec +++ b/openstudio-workflow.gemspec @@ -26,11 +26,13 @@ Gem::Specification.new do |s| s.add_development_dependency 'ci_reporter', '~> 2.1.0' s.add_development_dependency 'ci_reporter_rspec', '~> 1.0.0' s.add_development_dependency 'coveralls', '~> 0.8.21' - s.add_development_dependency 'json-schema', '~> 2.8.0' + s.add_development_dependency 'json-schema', '~> 4' s.add_development_dependency 'openstudio_measure_tester', '~> 0.4.0' s.add_development_dependency 'parallel', '~> 1.19.1' s.add_development_dependency 'public_suffix', '~> 4.0.3' s.add_development_dependency 'rainbow', '~> 3.0.0' s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'rspec', '~> 3.9' + s.add_development_dependency 'openstudio-standards', '~> 0.7.0' + s.add_development_dependency 'zip', '~> 2' end From bec645e83a7f945faf146e2df1de6caab238c2a2 Mon Sep 17 00:00:00 2001 From: Brian Ball Date: Thu, 22 May 2025 09:39:07 -0500 Subject: [PATCH 3/8] Update openstudio-workflow.gemspec --- openstudio-workflow.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openstudio-workflow.gemspec b/openstudio-workflow.gemspec index 4810a18..9398207 100644 --- a/openstudio-workflow.gemspec +++ b/openstudio-workflow.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'ci_reporter_rspec', '~> 1.0.0' s.add_development_dependency 'coveralls', '~> 0.8.21' s.add_development_dependency 'json-schema', '~> 4' - s.add_development_dependency 'openstudio_measure_tester', '~> 0.4.0' + s.add_development_dependency 'openstudio_measure_tester', '~> 0.5.0' s.add_development_dependency 'parallel', '~> 1.19.1' s.add_development_dependency 'public_suffix', '~> 4.0.3' s.add_development_dependency 'rainbow', '~> 3.0.0' From 70c3d28cd0bbf302518f4d5152a4ef6442981074 Mon Sep 17 00:00:00 2001 From: Brian Ball Date: Thu, 22 May 2025 09:41:39 -0500 Subject: [PATCH 4/8] add rubocop --- openstudio-workflow.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/openstudio-workflow.gemspec b/openstudio-workflow.gemspec index 9398207..6a254b3 100644 --- a/openstudio-workflow.gemspec +++ b/openstudio-workflow.gemspec @@ -33,6 +33,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rainbow', '~> 3.0.0' s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'rspec', '~> 3.9' + s.add_development_dependency 'rubocop', '~> 1.50.0' s.add_development_dependency 'openstudio-standards', '~> 0.7.0' s.add_development_dependency 'zip', '~> 2' end From be1eaaf327c011956adc220949f3f00c38e4ee40 Mon Sep 17 00:00:00 2001 From: Brian Ball Date: Thu, 22 May 2025 09:50:33 -0500 Subject: [PATCH 5/8] Update openstudio-workflow.gemspec --- openstudio-workflow.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openstudio-workflow.gemspec b/openstudio-workflow.gemspec index 6a254b3..6f4c590 100644 --- a/openstudio-workflow.gemspec +++ b/openstudio-workflow.gemspec @@ -33,7 +33,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rainbow', '~> 3.0.0' s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'rspec', '~> 3.9' - s.add_development_dependency 'rubocop', '~> 1.50.0' + s.add_development_dependency 'rubocop', '~> 1.50' s.add_development_dependency 'openstudio-standards', '~> 0.7.0' s.add_development_dependency 'zip', '~> 2' end From 763c414ddff40a81cdd7b747f82d309c361c6a2e Mon Sep 17 00:00:00 2001 From: Brian Ball Date: Thu, 22 May 2025 09:51:51 -0500 Subject: [PATCH 6/8] Update version.rb --- lib/openstudio/workflow/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/openstudio/workflow/version.rb b/lib/openstudio/workflow/version.rb index c90a79f..0a319ee 100644 --- a/lib/openstudio/workflow/version.rb +++ b/lib/openstudio/workflow/version.rb @@ -7,6 +7,6 @@ module OpenStudio module Workflow - VERSION = '2.4.0' # Suffixes must have periods (not dashes) + VERSION = '2.5.0' # Suffixes must have periods (not dashes) end end From e18160739bb3e40e3a0b8595b863e373c26af941 Mon Sep 17 00:00:00 2001 From: Brian Ball Date: Thu, 22 May 2025 09:53:07 -0500 Subject: [PATCH 7/8] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index efe7ca5..8b37ed1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ OpenStudio::Workflow Change Log ================================== +Version 2.5.0 +------------- +* openstudio 3.10 + Version 2.4.0 ------------- * Minimum Ruby version upgraded to 3.2.2 From 075185d0f72a6ddc23a536e9b64a9ec440481a3c Mon Sep 17 00:00:00 2001 From: brianlball Date: Thu, 22 May 2025 10:22:19 -0500 Subject: [PATCH 8/8] remove Jenkinsfile --- Jenkinsfile | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 29c42ae..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,10 +0,0 @@ -//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs - -@Library('cbci_shared_libs') _ - -// Build for PR to develop branch only. -if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set - - openstudio_workflow() - -}