Handle MSVC versions better

NREL · Apr 3, 2024 · a6fc335 · a6fc335
1 parent 0e6c542
commit a6fc335
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml
@@ -211,4 +211,4 @@ jobs:
 #        uses: mxschmitt/action-tmate@v3
 
       - name: Run Package Tests
-        run: python checkout/scripts/package_tests/runner.py --verbose win64 package/
+        run: python checkout/scripts/package_tests/runner.py --verbose --msvc 2022 win64 package/
diff --git a/scripts/package_tests/ep_testing/config.py b/scripts/package_tests/ep_testing/config.py
@@ -100,7 +100,7 @@ def __init__(self, run_config_key: str, this_version: str, last_version: str, la
         self.os_version = this_config['os_version']
         self.os = this_config['os']
         self.msvc_version = None
-        if msvc_version is not None:
+        if msvc_version in ['16', '17', '18']:
             self.msvc_version = msvc_version
         elif self.os == OS.Windows and self.os_version == '2022':
             self.msvc_version = 17

diff --git a/scripts/package_tests/runner.py b/scripts/package_tests/runner.py
@@ -133,7 +133,7 @@ def main() -> int:
     arg = parser.add_argument  # readability
     arg('config', choices=CONFIGURATIONS.keys(), help="Specify the run configuration")
     arg('package_dir', help="Path to the extracted EnergyPlus package directory")
-    arg('--msvc', type=str, default='2022', help="For MSVC builds, this is the VS 'year', like '2022'")
+    arg('--msvc', type=str, default='', help="For MSVC builds, this is the VS 'year', like '2022'")
     arg('--verbose', action='store_true', help="If specified, get verbose output")
     args = parser.parse_args()
     this, last, last_tag = get_version_info()