Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
67 changes: 16 additions & 51 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member Author

Choose a reason for hiding this comment

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

Dropping older OpenStudio SDK test runs ...

test_321x:
runs-on: ubuntu-22.04
steps:
Expand All @@ -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:
Expand Down Expand Up @@ -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
Copy link
Member Author

Choose a reason for hiding this comment

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

... in favour of more recent ones.

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
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/tbd_monkey_patch/LICENSE.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/tbd_monkey_patch/measure.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/tbd_tests.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/tbd_tests/version.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions tbd_tests.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ 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 "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"
Expand All @@ -52,8 +52,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
Expand Down