Skip to content

Commit

Permalink
Merge pull request #261 from NREL/3.6.0
Browse files Browse the repository at this point in the history
Updates for latest OpenStudio v3.6.0
  • Loading branch information
tijcolem authored May 11, 2023
2 parents 29499e7 + 2a90e44 commit c6e3a65
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_pat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
node-version: 18
allow_failure: false
- name: macOS
os: macos-10.15
os: macos-11
node-version: 18
allow_failure: false
MACOSX_DEPLOYMENT_TARGET: 10.15
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
cmake_minimum_required(VERSION 3.14.0)
cmake_policy(SET CMP0048 NEW)

project(ParametricAnalysisTool VERSION 3.5.2)

project(ParametricAnalysisTool VERSION 3.6.0)


find_package(Git)

Expand Down
4 changes: 2 additions & 2 deletions app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"productName": "ParametricAnalysisTool",
"identifier": "gov.nrel.openstudio.pat",
"description": "OpenStudio Parametric Analysis Tool",
"version": "3.5.2",
"version": "3.6.0",
"author": "National Renewable Energy Laboratory",
"main": "background.js",
"dependencies": {
Expand Down
12 changes: 6 additions & 6 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,33 +60,33 @@
"type": "mongo"
}],
"openstudio": [{
"name": "OpenStudio-3.5.1-Windows.tar.gz",
"name": "OpenStudio-3.6.0-Windows.tar.gz",
"platform": "win32",
"arch": "x64",
"type": "openstudio"
}, {
"name": "OpenStudio-3.5.1-Darwin.tar.gz",
"name": "OpenStudio-3.6.0-Darwin.tar.gz",
"platform": "darwin",
"arch": "x64",
"type": "openstudio"
}, {
"name": "OpenStudio-3.5.1-Linux.tar.gz",
"name": "OpenStudio-3.6.0-Linux.tar.gz",
"platform": "linux",
"arch": "x64",
"type": "OpenStudio"
}],
"openstudioServer": [{
"name": "OpenStudio-server-24210fa25b-win32.tar.gz",
"name": "OpenStudio-server-285e41bf7e-win32.tar.gz",
"platform": "win32",
"arch": "x64",
"type": "OpenStudio-server"
}, {
"name": "OpenStudio-server-24210fa25b-darwin.tar.gz",
"name": "OpenStudio-server-285e41bf7e-darwin.tar.gz",
"platform": "darwin",
"arch": "x64",
"type": "OpenStudio-server"
}, {
"name": "OpenStudio-server-24210fa25b-linux.tar.gz",
"name": "OpenStudio-server-285e41bf7e-linux.tar.gz",
"platform": "linux",
"arch": "x64",
"type": "OpenStudio-server"
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "openstudio-pat",
"version": "3.5.2",
"version": "3.6.0",
"devDependencies": {
"@babel/core": "~7.19.3",
"@babel/eslint-parser": "~7.19.1",
Expand Down

0 comments on commit c6e3a65

Please sign in to comment.