From 9b0333b290891e722bafad45829b2635a00edc32 Mon Sep 17 00:00:00 2001
From: kflemin <2205659+kflemin@users.noreply.github.com>
Date: Fri, 22 Sep 2023 12:17:30 -0600
Subject: [PATCH 01/10] testing out new labs MeasureManager

---
 app/app/main/measureManagerService.js | 71 +++++++++++++++++++++++----
 copyright.txt                         |  2 +-
 license.txt                           |  2 +-
 3 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/app/app/main/measureManagerService.js b/app/app/main/measureManagerService.js
index 7d3c3699..a31f5550 100644
--- a/app/app/main/measureManagerService.js
+++ b/app/app/main/measureManagerService.js
@@ -59,9 +59,18 @@ export class MeasureManager {
     return vm.mmReadyDeferred.promise;
   }
 
+  sleep(milliseconds) {
+    var start = new Date().getTime();
+    for (var i = 0; i < 1e7; i++) {
+      if ((new Date().getTime() - start) > milliseconds){
+        break;
+      }
+    }
+  }
+
   startMeasureManager() {
     const vm = this;
-
+    let str = '';
     // find an open port
     portfinder.getPortPromise({
       port: 3100,
@@ -70,12 +79,16 @@ export class MeasureManager {
       vm.port = port;
       vm.$log.info('Measure Manager port: ', vm.port);
 
-      vm.$log.info('Start Measure Manager Server: ', vm.cliPath, ' measure -s ', vm.port);
-      vm.cli = vm.spawn(vm.cliPath, ['classic', 'measure', '-s', vm.port]);
+      vm.$log.info('Start Measure Manager Server: ', vm.cliPath, 'labs measure -s ', vm.port);
+      console.log(vm.cliPath, 'labs measure -s ', vm.port)
+      let the_cmd = vm.cliPath + ' labs';
+      vm.cli = vm.spawn(vm.cliPath, ['labs', 'measure', '-s', vm.port], { cwd: '.', stdio : 'pipe' });
       vm.cli.stdout.on('data', (data) => {
         // record errors
         if (data.indexOf('<0>') !== -1) {
           // WARNING
+          // KF Note: I think the "labs command is experimental warning will/should show up 
+          // here. that might not be good.
           vm.$log.warn(`MeasureManager WARNING: ${data}`);
           vm.Message.appendMeasureManagerError({type: 'warning', data: data.toString()});
         } else if (data.indexOf('<1>') !== -1) {
@@ -88,10 +101,11 @@ export class MeasureManager {
           vm.Message.appendMeasureManagerError({type: 'fatal', data: data.toString()});
         }
         else {
-          if (vm.Message.showDebug()) vm.$log.debug(`MeasureManager: ${data}`);
+         if (vm.Message.showDebug()) vm.$log.debug(`MeasureManager: ${data}`);
         }
+        
         // check that the mm was started correctly: resolve readyDeferred
-        const str = data.toString();
+        str = data.toString();
         if (str.indexOf('WEBrick::HTTPServer#start: pid=') !== -1) {
           if (vm.Message.showDebug()) vm.$log.debug('Found WEBrick Start!, resolve promise');
           vm.mmReadyDeferred.resolve();
@@ -106,12 +120,17 @@ export class MeasureManager {
           if (vm.Message.showDebug()) vm.$log.debug('WEBrick already running...assuming MeasureManager is already up');
           vm.mmReadyDeferred.resolve();
         }
-
+        else if (str.indexOf('Serving on: ') !== -1) {
+          // KF Note: I would expect that we end up here (if the warning isn't picked up)
+          // but we don't seem to get here when we should
+          console.log("LABS command Serving on... detected. MM is running!")
+          vm.mmReadyDeferred.resolve();
+        }
       });
       vm.cli.stderr.on('data', (data) => {
         vm.$log.info(`MeasureManager: ${data}`);
         // check that the mm was started correctly: resolve readyDeferred
-        const str = data.toString();
+        str = data.toString();
         if (str.indexOf('WEBrick::HTTPServer#start: pid=') !== -1) {
           if (vm.Message.showDebug()) vm.$log.debug('Found WEBrick Start!, resolve promise');
           vm.mmReadyDeferred.resolve();
@@ -127,10 +146,40 @@ export class MeasureManager {
           vm.mmReadyDeferred.resolve();
         }
       });
+      vm.cli.on('error', (err) => {
+        console.log('Failed to start measure manager');
+      }); 
+      vm.cli.on('message', (msg) => {
+        console.log(`child message due to receipt of signal ${msg}`);
+      });
+
       vm.cli.on('close', (code) => {
         vm.$log.info(`Measure Manager exited with code ${code}`);
       });
-    }).catch(() => vm.$log.error('Error locating an open port for measure manager.'));
+      vm.cli.on('exit', (code) => {
+        if (code !== 0) {
+          const msg = `Failed with code = ${code}`;
+        }
+      });
+
+      // KF Note: new labs MM is not returning anything at all (or in time) but it is 
+      // up and running. sleep 2 second and then try to use it
+      vm.sleep(2 * 1000);
+      let the_url = vm.url + ":" + vm.port;
+      console.log("Measure Manager URL: ", the_url)
+      vm.$http.get(the_url)
+      .then(res => {
+        vm.$log.info('MeasureManager status: ', res.data);
+        console.log("MM pinged and it seemed started!")
+        vm.mmReadyDeferred.resolve();
+      })
+      .catch(res => {
+        vm.$log.error('MeasureManager is not up and running: ', res.data);
+      });
+
+    }).catch((err) => {
+      vm.$log.error('Error locating an open port for measure manager.')
+    });
   }
 
   stopMeasureManager() {
@@ -230,6 +279,7 @@ export class MeasureManager {
   // Returns the path to the myMeasures directory
   getMyMeasuresDir() {
     const vm = this;
+    console.log("GetMyMeasuresDir url: ", `${vm.url}:${vm.port}`)
     return vm.$http.get(`${vm.url}:${vm.port}`, {
       params: {}
     })
@@ -249,7 +299,6 @@ export class MeasureManager {
 
     // reset MeasureManagerErrors when a new action
     vm.Message.resetMeasureManagerErrors();
-
     return vm.$http.post(`${vm.url}:${vm.port}/set`, params)
       .then(res => {
         vm.$log.info('Measure Manager setMyMeasuresDir Success!, status: ', res.status);
@@ -289,7 +338,9 @@ export class MeasureManager {
       .then(res => {
         vm.$log.info('Measure Manager download_bcl_measure Success!, status: ', res.status);
         vm.$log.info('Data: ', res.data);
-        return res.data[0];
+        // KAF: format of res.data has changed with labs MM
+        //return res.data[0];
+        return res.data
       })
       .catch(res => {
         vm.$log.error('Measure Manager download_bcl_measure Error: ', res.data);
diff --git a/copyright.txt b/copyright.txt
index 22166f0d..d0787b46 100644
--- a/copyright.txt
+++ b/copyright.txt
@@ -1,5 +1,5 @@
 OpenStudio
-Copyright (c) 2008-2020, Alliance for Sustainable Energy
+Copyright (c) 2008-2023, Alliance for Sustainable Energy
 All Rights Reserved.
 
 
diff --git a/license.txt b/license.txt
index 8152cae1..848a45fd 100644
--- a/license.txt
+++ b/license.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2008-2020, Alliance for Sustainable Energy.
+Copyright (c) 2008-2023, Alliance for Sustainable Energy.
 All rights reserved.
 
                                    NOTICE

From 62aa7e09581e97f43868691363c1e03cc4425538 Mon Sep 17 00:00:00 2001
From: kflemin <2205659+kflemin@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:45:14 -0600
Subject: [PATCH 02/10] cleanup for labs measure manager

---
 app/app/main/measureManagerService.js | 33 +++++----------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/app/app/main/measureManagerService.js b/app/app/main/measureManagerService.js
index a31f5550..6f26656d 100644
--- a/app/app/main/measureManagerService.js
+++ b/app/app/main/measureManagerService.js
@@ -80,15 +80,11 @@ export class MeasureManager {
       vm.$log.info('Measure Manager port: ', vm.port);
 
       vm.$log.info('Start Measure Manager Server: ', vm.cliPath, 'labs measure -s ', vm.port);
-      console.log(vm.cliPath, 'labs measure -s ', vm.port)
       let the_cmd = vm.cliPath + ' labs';
       vm.cli = vm.spawn(vm.cliPath, ['labs', 'measure', '-s', vm.port], { cwd: '.', stdio : 'pipe' });
       vm.cli.stdout.on('data', (data) => {
         // record errors
         if (data.indexOf('<0>') !== -1) {
-          // WARNING
-          // KF Note: I think the "labs command is experimental warning will/should show up 
-          // here. that might not be good.
           vm.$log.warn(`MeasureManager WARNING: ${data}`);
           vm.Message.appendMeasureManagerError({type: 'warning', data: data.toString()});
         } else if (data.indexOf('<1>') !== -1) {
@@ -107,23 +103,22 @@ export class MeasureManager {
         // check that the mm was started correctly: resolve readyDeferred
         str = data.toString();
         if (str.indexOf('WEBrick::HTTPServer#start: pid=') !== -1) {
-          if (vm.Message.showDebug()) vm.$log.debug('Found WEBrick Start!, resolve promise');
+          vm.$log.info('Found WEBrick Start, MeasureManager is running');
           vm.mmReadyDeferred.resolve();
         }
         // TODO: THIS IS TEMPORARY (windows):
         else if (str.indexOf('Only one usage of each socket address') !== -1) {
-          if (vm.Message.showDebug()) vm.$log.debug('WEBrick already running...assuming MeasureManager is already up');
+          vm.$log.info('WEBrick already running...assuming MeasureManager is already up');
           vm.mmReadyDeferred.resolve();
         }
         // TODO: THIS IS TEMPORARY (mac):
         else if (str.indexOf('Error: Address already in use') !== -1) {
-          if (vm.Message.showDebug()) vm.$log.debug('WEBrick already running...assuming MeasureManager is already up');
+          vm.$log.info('WEBrick already running...assuming MeasureManager is already running');
           vm.mmReadyDeferred.resolve();
         }
-        else if (str.indexOf('Serving on: ') !== -1) {
-          // KF Note: I would expect that we end up here (if the warning isn't picked up)
-          // but we don't seem to get here when we should
-          console.log("LABS command Serving on... detected. MM is running!")
+        else if (str.indexOf('MeasureManager Ready') !== -1) {
+          // New labs command MeasureManager
+          vm.$log.info("LABS command 'MeasureManagerReady' detected. MeasureManager is running!");
           vm.mmReadyDeferred.resolve();
         }
       });
@@ -162,21 +157,6 @@ export class MeasureManager {
         }
       });
 
-      // KF Note: new labs MM is not returning anything at all (or in time) but it is 
-      // up and running. sleep 2 second and then try to use it
-      vm.sleep(2 * 1000);
-      let the_url = vm.url + ":" + vm.port;
-      console.log("Measure Manager URL: ", the_url)
-      vm.$http.get(the_url)
-      .then(res => {
-        vm.$log.info('MeasureManager status: ', res.data);
-        console.log("MM pinged and it seemed started!")
-        vm.mmReadyDeferred.resolve();
-      })
-      .catch(res => {
-        vm.$log.error('MeasureManager is not up and running: ', res.data);
-      });
-
     }).catch((err) => {
       vm.$log.error('Error locating an open port for measure manager.')
     });
@@ -279,7 +259,6 @@ export class MeasureManager {
   // Returns the path to the myMeasures directory
   getMyMeasuresDir() {
     const vm = this;
-    console.log("GetMyMeasuresDir url: ", `${vm.url}:${vm.port}`)
     return vm.$http.get(`${vm.url}:${vm.port}`, {
       params: {}
     })

From bb9e17cb6d8b39f59b2e0069543969cb3f5f6530 Mon Sep 17 00:00:00 2001
From: Julien Marrec <julien.marrec@gmail.com>
Date: Thu, 14 Nov 2024 09:00:23 +0100
Subject: [PATCH 03/10] Reudate copyright / license (the jS files should be
 updated too, but don't want to mud the PR)

---
 copyright.txt | 2 +-
 license.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/copyright.txt b/copyright.txt
index d0787b46..2e54a400 100644
--- a/copyright.txt
+++ b/copyright.txt
@@ -1,5 +1,5 @@
 OpenStudio
-Copyright (c) 2008-2023, Alliance for Sustainable Energy
+Copyright (c) 2008-2024, Alliance for Sustainable Energy
 All Rights Reserved.
 
 
diff --git a/license.txt b/license.txt
index 848a45fd..4490c697 100644
--- a/license.txt
+++ b/license.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2008-2023, Alliance for Sustainable Energy.
+Copyright (c) 2008-2024, Alliance for Sustainable Energy.
 All rights reserved.
 
                                    NOTICE

From ecf8cd78b33ee75ad13f86e4428d34f2028ac5cb Mon Sep 17 00:00:00 2001
From: Julien Marrec <julien.marrec@gmail.com>
Date: Thu, 14 Nov 2024 13:34:52 +0100
Subject: [PATCH 04/10] Tweak

---
 app/app/main/measureManagerService.js | 77 ++++++++-------------------
 1 file changed, 21 insertions(+), 56 deletions(-)

diff --git a/app/app/main/measureManagerService.js b/app/app/main/measureManagerService.js
index 6f26656d..184b9317 100644
--- a/app/app/main/measureManagerService.js
+++ b/app/app/main/measureManagerService.js
@@ -59,18 +59,8 @@ export class MeasureManager {
     return vm.mmReadyDeferred.promise;
   }
 
-  sleep(milliseconds) {
-    var start = new Date().getTime();
-    for (var i = 0; i < 1e7; i++) {
-      if ((new Date().getTime() - start) > milliseconds){
-        break;
-      }
-    }
-  }
-
   startMeasureManager() {
     const vm = this;
-    let str = '';
     // find an open port
     portfinder.getPortPromise({
       port: 3100,
@@ -79,9 +69,8 @@ export class MeasureManager {
       vm.port = port;
       vm.$log.info('Measure Manager port: ', vm.port);
 
-      vm.$log.info('Start Measure Manager Server: ', vm.cliPath, 'labs measure -s ', vm.port);
-      let the_cmd = vm.cliPath + ' labs';
-      vm.cli = vm.spawn(vm.cliPath, ['labs', 'measure', '-s', vm.port], { cwd: '.', stdio : 'pipe' });
+      vm.$log.info('Start Measure Manager Server: ', vm.cliPath, 'measure -s ', vm.port);
+      vm.cli = vm.spawn(vm.cliPath, ['measure', '-s', vm.port], { cwd: '.', stdio : 'pipe' });
       vm.cli.stdout.on('data', (data) => {
         // record errors
         if (data.indexOf('<0>') !== -1) {
@@ -92,58 +81,32 @@ export class MeasureManager {
           vm.$log.error(`MeasureManager ERROR: ${data}`);
           vm.Message.appendMeasureManagerError({type: 'error', data: data.toString()});
         } else if(data.indexOf('<2>') !== -1) {
-          // ERROR
+          // FATAL
           vm.$log.error(`MeasureManager ERROR: ${data}`);
           vm.Message.appendMeasureManagerError({type: 'fatal', data: data.toString()});
+        } else {
+          if (vm.Message.showDebug()) {
+            vm.$log.debug(`MeasureManager: ${data}`);
+          }
         }
-        else {
-         if (vm.Message.showDebug()) vm.$log.debug(`MeasureManager: ${data}`);
-        }
-        
+
         // check that the mm was started correctly: resolve readyDeferred
-        str = data.toString();
-        if (str.indexOf('WEBrick::HTTPServer#start: pid=') !== -1) {
-          vm.$log.info('Found WEBrick Start, MeasureManager is running');
-          vm.mmReadyDeferred.resolve();
-        }
-        // TODO: THIS IS TEMPORARY (windows):
-        else if (str.indexOf('Only one usage of each socket address') !== -1) {
-          vm.$log.info('WEBrick already running...assuming MeasureManager is already up');
-          vm.mmReadyDeferred.resolve();
-        }
-        // TODO: THIS IS TEMPORARY (mac):
-        else if (str.indexOf('Error: Address already in use') !== -1) {
-          vm.$log.info('WEBrick already running...assuming MeasureManager is already running');
-          vm.mmReadyDeferred.resolve();
-        }
-        else if (str.indexOf('MeasureManager Ready') !== -1) {
-          // New labs command MeasureManager
-          vm.$log.info("LABS command 'MeasureManagerReady' detected. MeasureManager is running!");
+        const str = data.toString();
+        if ((str.indexOf('Accepting requests on:') !== -1) ||
+            (str.indexOf('MeasureManager Ready') !== -1)) {
+          vm.$log.info('Found MeasureManager Start, MeasureManager is running');
           vm.mmReadyDeferred.resolve();
         }
       });
       vm.cli.stderr.on('data', (data) => {
-        vm.$log.info(`MeasureManager: ${data}`);
-        // check that the mm was started correctly: resolve readyDeferred
-        str = data.toString();
-        if (str.indexOf('WEBrick::HTTPServer#start: pid=') !== -1) {
-          if (vm.Message.showDebug()) vm.$log.debug('Found WEBrick Start!, resolve promise');
-          vm.mmReadyDeferred.resolve();
-        }
-        // TODO: THIS IS TEMPORARY (windows):
-        else if (str.indexOf('Only one usage of each socket address') !== -1) {
-          if (vm.Message.showDebug()) vm.$log.debug('WEBrick already running...using tempMeasureManager');
-          vm.mmReadyDeferred.resolve();
-        }
-        // TODO: THIS IS TEMPORARY (mac):
-        else if (str.indexOf('Error: Address already in use') !== -1) {
-          if (vm.Message.showDebug()) vm.$log.debug('WEBrick already running...using tempMeasureManager');
-          vm.mmReadyDeferred.resolve();
-        }
+        // C++ CLI printing errors when requests fail on stderr, eg when post
+        // data is missing:
+        // [2024-11-14T13:32:17+01:00] "POST /compute_arguments HTTP/1.1" 400
+        vm.$log.error(`MeasureManager: ${data}`);
       });
       vm.cli.on('error', (err) => {
         console.log('Failed to start measure manager');
-      }); 
+      });
       vm.cli.on('message', (msg) => {
         console.log(`child message due to receipt of signal ${msg}`);
       });
@@ -154,11 +117,12 @@ export class MeasureManager {
       vm.cli.on('exit', (code) => {
         if (code !== 0) {
           const msg = `Failed with code = ${code}`;
+          console.log(msg);
         }
       });
 
     }).catch((err) => {
-      vm.$log.error('Error locating an open port for measure manager.')
+      vm.$log.error('Error locating an open port for measure manager.');
     });
   }
 
@@ -317,7 +281,8 @@ export class MeasureManager {
       .then(res => {
         vm.$log.info('Measure Manager download_bcl_measure Success!, status: ', res.status);
         vm.$log.info('Data: ', res.data);
-        // KAF: format of res.data has changed with labs MM
+        // Classic (Ruby) CLI uses to return a single-element list
+        // C++ CLI returns the element directly
         //return res.data[0];
         return res.data
       })

From 9624c8f4b7a26eaef65cb4bbba3a4ec2b264973b Mon Sep 17 00:00:00 2001
From: Julien Marrec <julien.marrec@gmail.com>
Date: Thu, 14 Nov 2024 16:53:50 +0100
Subject: [PATCH 05/10] Bump actions

---
 .github/workflows/build_pat.yaml | 14 +++++++-------
 .github/workflows/playwright.yml |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_pat.yaml b/.github/workflows/build_pat.yaml
index 4a6efdc5..66037965 100755
--- a/.github/workflows/build_pat.yaml
+++ b/.github/workflows/build_pat.yaml
@@ -8,7 +8,7 @@ on:
     branches:
       -  '*'
     tags:
-      - '*' 
+      - '*'
 
 jobs:
   pat_build:
@@ -39,10 +39,10 @@ jobs:
 
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Node ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -60,7 +60,7 @@ jobs:
           sudo ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/MacOS/QtInstallerFramework-macOS-x64-4.3.0 --verbose --script ./ci/install_script_qtifw.qs
           ls ~/Qt/QtIFW-4.3.0 || true
           echo "~/Qt/QtIFW-4.3.0/bin/" >> $GITHUB_PATH
-          echo MACOSX_DEPLOYMENT_TARGET=${{ matrix.MACOSX_DEPLOYMENT_TARGET }} >> $GITHUB_ENV  
+          echo MACOSX_DEPLOYMENT_TARGET=${{ matrix.MACOSX_DEPLOYMENT_TARGET }} >> $GITHUB_ENV
           # echo CMAKE_MACOSX_DEPLOYMENT_TARGET='-DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET' >> $GITHUB_ENV
         elif [ "$RUNNER_OS" == "Windows" ]; then
           curl -L -O https://download.qt.io/archive/qt-installer-framework/4.3.0/QtInstallerFramework-windows-x86-4.3.0.exe
@@ -71,7 +71,7 @@ jobs:
           #echo CMAKE_GENERATOR='Visual Studio 16 2019' >> $GITHUB_ENV
           #echo CMAKE_GENERATOR_PLATFORM=x64 >> $GITHUB_ENV
           # C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise
-          # Command below no longer working and returning the version number. 
+          # Command below no longer working and returning the version number.
           # MSVC_DIR=$(cmd.exe /c "vswhere -products * -requires Microsoft.Component.MSBuild -property installationPath -latest")
           MSVC_DIR="C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
           echo "Latest is: $MSVC_DIR"
@@ -93,7 +93,7 @@ jobs:
         call vcvarsall.bat x64
         cmake -G "Visual Studio 17 2022" -A x64 ..
         cmake --build . --target package -j 2 --config Release
-      
+
     - name: Configure CMake & build (Linux)
       working-directory: ./build
       if: runner.os == 'Linux'
@@ -128,4 +128,4 @@ jobs:
         name: PAT-Installer-${{ matrix.name }}
         path: ./build/ParametricAnalysisTool-*
 
-  
+
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 48f8322e..ce6a8fee 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -10,8 +10,8 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 17
           cache: npm
@@ -23,7 +23,7 @@ jobs:
         run: npm ci
       - name: Cache runtime dependencies
         id: cache-runtime-deps
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: depend/
           key: ${{ runner.os }}-${{ hashFiles('manifest.json') }}
@@ -35,7 +35,7 @@ jobs:
       - name: Prepare tmp test files
         run: npm run test:tmpFiles
       - name: Run playwright tests
-        uses: GabrielBB/xvfb-action@v1
+        uses: coactions/setup-xvfb@v1
         with:
           run: |
             npm run test:parallel

From 3f1324957b10c39ed7fe05ec80bbfb44833b0d05 Mon Sep 17 00:00:00 2001
From: Julien Marrec <julien.marrec@gmail.com>
Date: Thu, 14 Nov 2024 17:01:00 +0100
Subject: [PATCH 06/10] Use nproc

---
 .github/workflows/build_pat.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_pat.yaml b/.github/workflows/build_pat.yaml
index 66037965..d7144d0b 100755
--- a/.github/workflows/build_pat.yaml
+++ b/.github/workflows/build_pat.yaml
@@ -80,6 +80,10 @@ jobs:
           echo "$MSVC_DIR\VC\Auxiliary\Build" >> $GITHUB_PATH
         fi;
 
+        N=$(nproc 2>/dev/null || sysctl -n hw.logicalcpu)
+        echo "There are $N threads available"
+        echo "N=$N" >> $GITHUB_ENV
+
     - name: Create Build Directory
       run: cmake -E make_directory ./build/
 
@@ -92,7 +96,7 @@ jobs:
         echo "Using vcvarsall to initialize the development environment"
         call vcvarsall.bat x64
         cmake -G "Visual Studio 17 2022" -A x64 ..
-        cmake --build . --target package -j 2 --config Release
+        cmake --build . --target package -j ${{ env.N }} --config Release
 
     - name: Configure CMake & build (Linux)
       working-directory: ./build
@@ -108,7 +112,7 @@ jobs:
               -DCPACK_BINARY_STGZ=OFF \
               -DCPACK_BINARY_TBZ2=OFF \
               ../
-        cmake --build . --target package -j 2
+        cmake --build . --target package -j $N
 
     - name: Configure CMake & build (macOS)
       working-directory: ./build
@@ -120,7 +124,7 @@ jobs:
               -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
               -DCMAKE_BUILD_TYPE=Release \
               ../
-        cmake --build . --target package -j 2
+        cmake --build . --target package -j $N
 
     - name: Save artifact
       uses: actions/upload-artifact@v4

From fab6a1a236d0205f4cf8f737f088890b1a97d223 Mon Sep 17 00:00:00 2001
From: Julien Marrec <julien.marrec@gmail.com>
Date: Thu, 14 Nov 2024 17:34:44 +0100
Subject: [PATCH 07/10] Use a distinct name for each artifact

---
 .github/workflows/build_pat.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_pat.yaml b/.github/workflows/build_pat.yaml
index d7144d0b..28a0731b 100755
--- a/.github/workflows/build_pat.yaml
+++ b/.github/workflows/build_pat.yaml
@@ -131,5 +131,6 @@ jobs:
       with:
         name: PAT-Installer-${{ matrix.name }}
         path: ./build/ParametricAnalysisTool-*
+        name: OpenStudio-PAT-{{ matrix.name }}-${{ github.sha }}
 
 

From df1638e989503459ceadce1d60aa9bc5eccb25d8 Mon Sep 17 00:00:00 2001
From: Julien Marrec <julien.marrec@gmail.com>
Date: Fri, 25 Apr 2025 16:53:31 +0200
Subject: [PATCH 08/10] Update copyright to 2025 instead of 2024 now

---
 copyright.txt | 2 +-
 license.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/copyright.txt b/copyright.txt
index 2e54a400..164a6e2f 100644
--- a/copyright.txt
+++ b/copyright.txt
@@ -1,5 +1,5 @@
 OpenStudio
-Copyright (c) 2008-2024, Alliance for Sustainable Energy
+Copyright (c) 2008-2025, Alliance for Sustainable Energy
 All Rights Reserved.
 
 
diff --git a/license.txt b/license.txt
index 4490c697..28b9d31b 100644
--- a/license.txt
+++ b/license.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2008-2024, Alliance for Sustainable Energy.
+Copyright (c) 2008-2025, Alliance for Sustainable Energy.
 All rights reserved.
 
                                    NOTICE

From 51f942ce22d3728b1b19dcd3f03b36e1d26fec13 Mon Sep 17 00:00:00 2001
From: Julien Marrec <julien.marrec@gmail.com>
Date: Fri, 25 Apr 2025 16:56:08 +0200
Subject: [PATCH 09/10] Bump playwright to ubuntu 22.04 (20.04 is gone)

---
 .github/workflows/playwright.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index ce6a8fee..6cb8243e 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   test:
     timeout-minutes: 60
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4

From be0703ff5b6f9312b4de120b8240e149e02f2cf8 Mon Sep 17 00:00:00 2001
From: brianlball <brian.ball@nrel.gov>
Date: Fri, 25 Apr 2025 10:34:39 -0500
Subject: [PATCH 10/10] double name: in build_pat.yaml CI

---
 .github/workflows/build_pat.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_pat.yaml b/.github/workflows/build_pat.yaml
index 28a0731b..c731dcd2 100755
--- a/.github/workflows/build_pat.yaml
+++ b/.github/workflows/build_pat.yaml
@@ -131,6 +131,6 @@ jobs:
       with:
         name: PAT-Installer-${{ matrix.name }}
         path: ./build/ParametricAnalysisTool-*
-        name: OpenStudio-PAT-{{ matrix.name }}-${{ github.sha }}
+        #name: OpenStudio-PAT-{{ matrix.name }}-${{ github.sha }}