From 316791f9ef2a5aa467ce504a4f17d5902461090a Mon Sep 17 00:00:00 2001 From: brgix Date: Tue, 12 Aug 2025 17:09:55 -0400 Subject: [PATCH 1/6] Tests TBD candidate v345 --- .github/workflows/pull_request.yml | 67 +++++++----------------------- Gemfile | 4 +- tbd_tests.gemspec | 8 ++-- 3 files changed, 24 insertions(+), 55 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index d3bce1e..fbb5aa4 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,23 +6,6 @@ on: - develop jobs: - test_300x: - runs-on: ubuntu-22.04 - steps: - - name: Check out repository - uses: actions/checkout@v3 - - name: Run Tests - run: | - echo $(pwd) - echo $(ls -RF) - docker pull nrel/openstudio:3.0.0 - docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.0.0 - docker exec -t test pwd - docker exec -t test ls - docker exec -t test bundle update - docker exec -t test bundle exec rake - docker exec -t test bundle exec rake suites_run - docker kill test test_321x: runs-on: ubuntu-22.04 steps: @@ -40,40 +23,6 @@ jobs: docker exec -t test bundle exec rake docker exec -t test bundle exec rake suites_run docker kill test - test_330x: - runs-on: ubuntu-22.04 - steps: - - name: Check out repository - uses: actions/checkout@v3 - - name: Run Tests - run: | - echo $(pwd) - echo $(ls -RF) - docker pull nrel/openstudio:3.3.0 - docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.3.0 - docker exec -t test pwd - docker exec -t test ls - docker exec -t test bundle update - docker exec -t test bundle exec rake - docker exec -t test bundle exec rake suites_run - docker kill test - test_340x: - runs-on: ubuntu-22.04 - steps: - - name: Check out repository - uses: actions/checkout@v3 - - name: Run Tests - run: | - echo $(pwd) - echo $(ls -RF) - docker pull nrel/openstudio:3.4.0 - docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.4.0 - docker exec -t test pwd - docker exec -t test ls - docker exec -t test bundle update - docker exec -t test bundle exec rake - docker exec -t test bundle exec rake suites_run - docker kill test test_351x: runs-on: ubuntu-22.04 steps: @@ -159,3 +108,19 @@ jobs: docker exec -t test bundle exec rake docker exec -t test bundle exec rake suites_run docker kill test + test_3100x: + runs-on: ubuntu-22.04 + steps: + - name: Check out repository + uses: actions/checkout@v2 + - name: Run Tests + run: | + echo $(pwd) + echo $(ls) + docker pull nrel/openstudio:3.10.0 + docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.10.0 + docker exec -t test pwd + docker exec -t test ls + docker exec -t test bundle update + docker exec -t test bundle exec rake + docker kill test diff --git a/Gemfile b/Gemfile index 0243d8d..e78abfb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,7 @@ source "https://rubygems.org" -gem "tbd", git: "https://github.com/rd2/tbd", branch: "develop" +gem "oslg", git: "https://github.com/rd2/oslg", branch: "v033" +gem "osut", git: "https://github.com/rd2/osut", branch: "v061" +gem "tbd", git: "https://github.com/rd2/tbd", branch: "osut" gemspec diff --git a/tbd_tests.gemspec b/tbd_tests.gemspec index 1afbcf7..f6f076a 100644 --- a/tbd_tests.gemspec +++ b/tbd_tests.gemspec @@ -27,7 +27,9 @@ Gem::Specification.new do |s| s.required_ruby_version = [">= 2.5.0", "< 4"] s.metadata = {} - s.add_development_dependency "tbd", "3.4.4" + s.add_development_dependency "oslg", ">= 0.4.0" + s.add_development_dependency "osut", "~> 0.7.0" + s.add_development_dependency "tbd", "3.4.5" s.add_development_dependency "json-schema", "~> 4" s.add_development_dependency "rake", "~> 13.0" s.add_development_dependency "rspec", "~> 3.11" @@ -52,8 +54,8 @@ Gem::Specification.new do |s| s.add_development_dependency "bundler", "~> 2.4.10" - s.add_development_dependency "openstudio-common-measures", "~> 0.11.0" - s.add_development_dependency "openstudio-model-articulation", "~> 0.11.0" + s.add_development_dependency "openstudio-common-measures", "~> 0.12.3" + s.add_development_dependency "openstudio-model-articulation", "~> 0.12.2" end s.metadata["homepage_uri" ] = s.homepage From 80467720612fac58c65e5745c4f3168594f4ea3b Mon Sep 17 00:00:00 2001 From: brgix Date: Tue, 12 Aug 2025 17:20:30 -0400 Subject: [PATCH 2/6] Updates release version --- lib/tbd_tests/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tbd_tests/version.rb b/lib/tbd_tests/version.rb index 9d29456..408a85b 100644 --- a/lib/tbd_tests/version.rb +++ b/lib/tbd_tests/version.rb @@ -29,5 +29,5 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. module TBD_Tests - VERSION = "0.2.3".freeze # TBD Tests release version + VERSION = "0.2.4".freeze end From 1d61ef2084e6c070ad3ee1538aa296ae0f9954c7 Mon Sep 17 00:00:00 2001 From: brgix Date: Wed, 13 Aug 2025 06:58:42 -0400 Subject: [PATCH 3/6] Pulls OSlg release v040 --- Gemfile | 1 - tbd_tests.gemspec | 1 - 2 files changed, 2 deletions(-) diff --git a/Gemfile b/Gemfile index e78abfb..e71be4e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,5 @@ source "https://rubygems.org" -gem "oslg", git: "https://github.com/rd2/oslg", branch: "v033" gem "osut", git: "https://github.com/rd2/osut", branch: "v061" gem "tbd", git: "https://github.com/rd2/tbd", branch: "osut" diff --git a/tbd_tests.gemspec b/tbd_tests.gemspec index f6f076a..097c1be 100644 --- a/tbd_tests.gemspec +++ b/tbd_tests.gemspec @@ -27,7 +27,6 @@ Gem::Specification.new do |s| s.required_ruby_version = [">= 2.5.0", "< 4"] s.metadata = {} - s.add_development_dependency "oslg", ">= 0.4.0" s.add_development_dependency "osut", "~> 0.7.0" s.add_development_dependency "tbd", "3.4.5" s.add_development_dependency "json-schema", "~> 4" From d810ccdf2485f105457209693476fd0d5fc443f2 Mon Sep 17 00:00:00 2001 From: brgix Date: Thu, 14 Aug 2025 09:35:22 -0400 Subject: [PATCH 4/6] Pulls OSut v0.7.0 gem --- Gemfile | 1 - tbd_tests.gemspec | 1 - 2 files changed, 2 deletions(-) diff --git a/Gemfile b/Gemfile index e71be4e..ec6879f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,5 @@ source "https://rubygems.org" -gem "osut", git: "https://github.com/rd2/osut", branch: "v061" gem "tbd", git: "https://github.com/rd2/tbd", branch: "osut" gemspec diff --git a/tbd_tests.gemspec b/tbd_tests.gemspec index 097c1be..c947c9b 100644 --- a/tbd_tests.gemspec +++ b/tbd_tests.gemspec @@ -27,7 +27,6 @@ Gem::Specification.new do |s| s.required_ruby_version = [">= 2.5.0", "< 4"] s.metadata = {} - s.add_development_dependency "osut", "~> 0.7.0" s.add_development_dependency "tbd", "3.4.5" s.add_development_dependency "json-schema", "~> 4" s.add_development_dependency "rake", "~> 13.0" From 033e1a4fd73d62845aba26976debe7cd66a1e19b Mon Sep 17 00:00:00 2001 From: brgix Date: Fri, 15 Aug 2025 09:47:43 -0400 Subject: [PATCH 5/6] Updates README & copyright --- LICENSE.md | 2 +- README.md | 6 +++--- lib/measures/tbd_monkey_patch/LICENSE.md | 2 +- lib/measures/tbd_monkey_patch/measure.rb | 2 +- lib/tbd_tests.rb | 2 +- lib/tbd_tests/version.rb | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 0d0e7ac..1ed1606 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2020-2024, Denis Bourgeois & Dan Macumber +Copyright (c) 2020-2025, Denis Bourgeois & Dan Macumber All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.md b/README.md index e3330bd..370ed7d 100644 --- a/README.md +++ b/README.md @@ -41,14 +41,14 @@ bundle exec rake suites_run Install [Docker](https://docs.docker.com/desktop/#download-and-install). -Pull the OpenStudio v3.6.1 Docker image: +Pull the OpenStudio v3.10.0 Docker image: ``` -docker pull nrel/openstudio:3.6.1 +docker pull nrel/openstudio:3.10.0 ``` In the root repository: ``` -docker run --name test --rm -d -t -v ${PWD}:/work -w /work nrel/openstudio:3.6.1 +docker run --name test --rm -d -t -v ${PWD}:/work -w /work nrel/openstudio:3.10.0 docker exec -t test bundle update docker exec -t test bundle exec rake docker kill test diff --git a/lib/measures/tbd_monkey_patch/LICENSE.md b/lib/measures/tbd_monkey_patch/LICENSE.md index a055dad..6b566ce 100644 --- a/lib/measures/tbd_monkey_patch/LICENSE.md +++ b/lib/measures/tbd_monkey_patch/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2024 Denis Bourgeois & Dan Macumber +Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/lib/measures/tbd_monkey_patch/measure.rb b/lib/measures/tbd_monkey_patch/measure.rb index a5b47b6..3b18b7c 100644 --- a/lib/measures/tbd_monkey_patch/measure.rb +++ b/lib/measures/tbd_monkey_patch/measure.rb @@ -1,6 +1,6 @@ # MIT License # -# Copyright (c) 2020-2024 Denis Bourgeois & Dan Macumber +# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/lib/tbd_tests.rb b/lib/tbd_tests.rb index 046efaa..20b3465 100644 --- a/lib/tbd_tests.rb +++ b/lib/tbd_tests.rb @@ -1,6 +1,6 @@ # BSD 3-Clause License # -# Copyright (c) 2020-2024, Denis Bourgeois & Dan Macumber +# Copyright (c) 2020-2025, Denis Bourgeois & Dan Macumber # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/lib/tbd_tests/version.rb b/lib/tbd_tests/version.rb index 408a85b..2295f4b 100644 --- a/lib/tbd_tests/version.rb +++ b/lib/tbd_tests/version.rb @@ -1,6 +1,6 @@ # BSD 3-Clause License # -# Copyright (c) 2020-2024, Denis Bourgeois & Dan Macumber +# Copyright (c) 2020-2025, Denis Bourgeois & Dan Macumber # All rights reserved. # # Redistribution and use in source and binary forms, with or without From 7007012b978fbb68faf3b7c2617712a56dc1fdcd Mon Sep 17 00:00:00 2001 From: brgix Date: Sat, 16 Aug 2025 07:51:54 -0400 Subject: [PATCH 6/6] Pulls TBD v345 ('develop' branch) --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index ec6879f..0243d8d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" -gem "tbd", git: "https://github.com/rd2/tbd", branch: "osut" +gem "tbd", git: "https://github.com/rd2/tbd", branch: "develop" gemspec