From 3a97e5a699fe48e3a23c6b8cf4d4a367b85f9eae Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Wed, 28 Jun 2023 14:41:26 -0600 Subject: [PATCH 1/2] update E+ packges to 23.1 --- manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index fb7d1ac..3fa11e7 100644 --- a/manifest.json +++ b/manifest.json @@ -1,17 +1,17 @@ { "endpoint": "https://openstudio-resources.s3.amazonaws.com/pat-dependencies3/", "energyplus": [{ - "name": "EnergyPlus-22.2.0-win32.tar.gz", + "name": "EnergyPlus-23.1.0-win32.tar.gz", "platform": "win32", "arch": "x64", "type": "energyplus" }, { - "name": "EnergyPlus-22.2.0-darwin.tar.gz", + "name": "EnergyPlus-23.1.0-darwin.tar.gz", "platform": "darwin", "arch": "x64", "type": "energyplus" }, { - "name": "EnergyPlus-22.2.0-linux.tar.gz", + "name": "EnergyPlus-23.1.0-linux.tar.gz", "platform": "linux", "arch": "x64", "type": "energyplus" From 73507e39c6f1ade3dfcd9cdd906bfc0557b4bb32 Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Thu, 29 Jun 2023 10:13:21 -0600 Subject: [PATCH 2/2] hard code the msvc path for 2022 --- .github/workflows/build_pat.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_pat.yaml b/.github/workflows/build_pat.yaml index 1ad190d..42edde5 100755 --- a/.github/workflows/build_pat.yaml +++ b/.github/workflows/build_pat.yaml @@ -71,7 +71,9 @@ 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 - MSVC_DIR=$(cmd.exe /c "vswhere -products * -requires Microsoft.Component.MSBuild -property installationPath -latest") + # 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" echo "MSVC_DIR=$MSVC_DIR" >> $GITHUB_ENV # add folder containing vcvarsall.bat