Skip to content

Commit a6fc335

Browse files
committed
Handle MSVC versions better
1 parent 0e6c542 commit a6fc335

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/windows_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,4 +211,4 @@ jobs:
211211
# uses: mxschmitt/action-tmate@v3
212212

213213
- name: Run Package Tests
214-
run: python checkout/scripts/package_tests/runner.py --verbose win64 package/
214+
run: python checkout/scripts/package_tests/runner.py --verbose --msvc 2022 win64 package/

scripts/package_tests/ep_testing/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def __init__(self, run_config_key: str, this_version: str, last_version: str, la
100100
self.os_version = this_config['os_version']
101101
self.os = this_config['os']
102102
self.msvc_version = None
103-
if msvc_version is not None:
103+
if msvc_version in ['16', '17', '18']:
104104
self.msvc_version = msvc_version
105105
elif self.os == OS.Windows and self.os_version == '2022':
106106
self.msvc_version = 17

scripts/package_tests/runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def main() -> int:
133133
arg = parser.add_argument # readability
134134
arg('config', choices=CONFIGURATIONS.keys(), help="Specify the run configuration")
135135
arg('package_dir', help="Path to the extracted EnergyPlus package directory")
136-
arg('--msvc', type=str, default='2022', help="For MSVC builds, this is the VS 'year', like '2022'")
136+
arg('--msvc', type=str, default='', help="For MSVC builds, this is the VS 'year', like '2022'")
137137
arg('--verbose', action='store_true', help="If specified, get verbose output")
138138
args = parser.parse_args()
139139
this, last, last_tag = get_version_info()

0 commit comments

Comments
 (0)