From 0cd44f030d206f59574980b951f3a147bf6b6b00 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Mon, 22 Dec 2025 15:22:53 -0700 Subject: [PATCH 01/16] Initial trial run --- .github/workflows/app_build.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index c5be791f7..0a4b64407 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -32,7 +32,8 @@ jobs: # fail-fast: Default is true, switch to false to allow one platform to fail and still run others fail-fast: false matrix: - os: [ubuntu-22.04, ubuntu-24.04, windows-2022, macos-13, macos-arm64] + #os: [ubuntu-22.04, ubuntu-24.04, windows-2022, macos-13, macos-arm64] + os: [macos-15, macos-15-arm64] include: - os: ubuntu-22.04 SELF_HOSTED: false @@ -64,7 +65,7 @@ jobs: QT_OS_NAME: windows QT_ARCH: win64_msvc2019_64 arch: x86_64 - - os: macos-13 + - os: macos-15 SELF_HOSTED: false PLATFORM_NAME: Darwin BINARY_EXT: dmg @@ -76,8 +77,8 @@ jobs: QT_OS_NAME: mac QT_ARCH: clang_64 arch: x86_64 - - os: macos-arm64 - SELF_HOSTED: true + - os: macos-15-arm64 + SELF_HOSTED: false PLATFORM_NAME: Darwin BINARY_EXT: dmg COMPRESSED_EXT: tar.gz @@ -698,17 +699,17 @@ jobs: # fail-fast: Default is true, switch to false to allow one platform to fail and still run others fail-fast: false matrix: - os: [macos-13, macos-14] + os: [macos-15, macos-15-arm64] include: - - os: macos-13 - binary_os: macos-13 + - os: macos-15 + binary_os: macos-15 SELF_HOSTED: false BINARY_EXT: dmg COMPRESSED_EXT: tar.gz arch: x86_64 # This is the GHA hosted one - - os: macos-14 - binary_os: macos-arm64 + - os: macos-15-arm64 + binary_os: macos-15-arm64 SELF_HOSTED: false BINARY_EXT: dmg COMPRESSED_EXT: tar.gz From 555482629709e3b382bdab3aa5db93f6eb3dd0cd Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Mon, 22 Dec 2025 15:44:39 -0700 Subject: [PATCH 02/16] macos-13 is the intel label, macos-15 is arm --- .github/workflows/app_build.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index 0a4b64407..5b1b5dd98 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -34,7 +34,7 @@ jobs: matrix: #os: [ubuntu-22.04, ubuntu-24.04, windows-2022, macos-13, macos-arm64] os: [macos-15, macos-15-arm64] - include: + exclude: - os: ubuntu-22.04 SELF_HOSTED: false PLATFORM_NAME: Linux @@ -65,7 +65,8 @@ jobs: QT_OS_NAME: windows QT_ARCH: win64_msvc2019_64 arch: x86_64 - - os: macos-15 + include: + - os: macos-13 SELF_HOSTED: false PLATFORM_NAME: Darwin BINARY_EXT: dmg @@ -73,11 +74,11 @@ jobs: BINARY_PKG_PATH: _CPack_Packages/Darwin/IFW COMPRESSED_PKG_PATH: _CPack_Packages/Darwin/TGZ MACOSX_DEPLOYMENT_TARGET: 13.0 - SDKROOT: /Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk + SDKROOT: /Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk QT_OS_NAME: mac QT_ARCH: clang_64 arch: x86_64 - - os: macos-15-arm64 + - os: macos-15 SELF_HOSTED: false PLATFORM_NAME: Darwin BINARY_EXT: dmg @@ -85,7 +86,7 @@ jobs: BINARY_PKG_PATH: _CPack_Packages/Darwin/IFW COMPRESSED_PKG_PATH: _CPack_Packages/Darwin/TGZ MACOSX_DEPLOYMENT_TARGET: 13.0 - SDKROOT: /Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk + SDKROOT: /Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk QT_OS_NAME: mac QT_ARCH: arm_64 arch: arm64 @@ -699,17 +700,16 @@ jobs: # fail-fast: Default is true, switch to false to allow one platform to fail and still run others fail-fast: false matrix: - os: [macos-15, macos-15-arm64] + os: [macos-13, macos-15] include: - - os: macos-15 - binary_os: macos-15 + - os: macos-13 + binary_os: macos-13 SELF_HOSTED: false BINARY_EXT: dmg COMPRESSED_EXT: tar.gz arch: x86_64 - # This is the GHA hosted one - - os: macos-15-arm64 - binary_os: macos-15-arm64 + - os: macos-15 + binary_os: macos-15 SELF_HOSTED: false BINARY_EXT: dmg COMPRESSED_EXT: tar.gz From 69371fdd506dae2d64bce291a5ba4a4e458a03ff Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Mon, 22 Dec 2025 15:47:13 -0700 Subject: [PATCH 03/16] Exclude non-mac jobs --- .github/workflows/app_build.yml | 61 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index 5b1b5dd98..5b042ead9 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -34,38 +34,37 @@ jobs: matrix: #os: [ubuntu-22.04, ubuntu-24.04, windows-2022, macos-13, macos-arm64] os: [macos-15, macos-15-arm64] - exclude: - - os: ubuntu-22.04 - SELF_HOSTED: false - PLATFORM_NAME: Linux - BINARY_EXT: deb - COMPRESSED_EXT: tar.gz - BINARY_PKG_PATH: _CPack_Packages/Linux/DEB - COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ - QT_OS_NAME: linux - QT_ARCH: gcc_64 - arch: x86_64 - - os: ubuntu-24.04 - SELF_HOSTED: false - PLATFORM_NAME: Linux - BINARY_EXT: deb - COMPRESSED_EXT: tar.gz - BINARY_PKG_PATH: _CPack_Packages/Linux/DEB - COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ - QT_OS_NAME: linux - QT_ARCH: gcc_64 - arch: x86_64 - - os: windows-2022 - SELF_HOSTED: false - PLATFORM_NAME: Windows - BINARY_EXT: exe - COMPRESSED_EXT: zip - BINARY_PKG_PATH: _CPack_Packages/win64/IFW - COMPRESSED_PKG_PATH: _CPack_Packages/win64/ZIP - QT_OS_NAME: windows - QT_ARCH: win64_msvc2019_64 - arch: x86_64 include: + #- os: ubuntu-22.04 + # SELF_HOSTED: false + # PLATFORM_NAME: Linux + # BINARY_EXT: deb + # COMPRESSED_EXT: tar.gz + # BINARY_PKG_PATH: _CPack_Packages/Linux/DEB + # COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ + # QT_OS_NAME: linux + # QT_ARCH: gcc_64 + # arch: x86_64 + #- os: ubuntu-24.04 + # SELF_HOSTED: false + # PLATFORM_NAME: Linux + # BINARY_EXT: deb + # COMPRESSED_EXT: tar.gz + # BINARY_PKG_PATH: _CPack_Packages/Linux/DEB + # COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ + # QT_OS_NAME: linux + # QT_ARCH: gcc_64 + # arch: x86_64 + #- os: windows-2022 + # SELF_HOSTED: false + # PLATFORM_NAME: Windows + # BINARY_EXT: exe + # COMPRESSED_EXT: zip + # BINARY_PKG_PATH: _CPack_Packages/win64/IFW + # COMPRESSED_PKG_PATH: _CPack_Packages/win64/ZIP + # QT_OS_NAME: windows + # QT_ARCH: win64_msvc2019_64 + # arch: x86_64 - os: macos-13 SELF_HOSTED: false PLATFORM_NAME: Darwin From c023bfbdad42d520e6bd2c51fa4d1efbf92e4f22 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Mon, 22 Dec 2025 15:48:49 -0700 Subject: [PATCH 04/16] Get the runner names right, runner names don't match image names --- .github/workflows/app_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index 5b042ead9..4001c314b 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -33,7 +33,7 @@ jobs: fail-fast: false matrix: #os: [ubuntu-22.04, ubuntu-24.04, windows-2022, macos-13, macos-arm64] - os: [macos-15, macos-15-arm64] + os: [macos-13, macos-15] include: #- os: ubuntu-22.04 # SELF_HOSTED: false From ea11af046c6f2f3a5e9237971c5591350a175cc9 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Mon, 22 Dec 2025 15:53:53 -0700 Subject: [PATCH 05/16] Update to macos-15-intel --- .github/workflows/app_build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index 4001c314b..8816ff46e 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -33,7 +33,7 @@ jobs: fail-fast: false matrix: #os: [ubuntu-22.04, ubuntu-24.04, windows-2022, macos-13, macos-arm64] - os: [macos-13, macos-15] + os: [macos-15-intel, macos-15] include: #- os: ubuntu-22.04 # SELF_HOSTED: false @@ -65,7 +65,7 @@ jobs: # QT_OS_NAME: windows # QT_ARCH: win64_msvc2019_64 # arch: x86_64 - - os: macos-13 + - os: macos-15-intel SELF_HOSTED: false PLATFORM_NAME: Darwin BINARY_EXT: dmg @@ -73,7 +73,7 @@ jobs: BINARY_PKG_PATH: _CPack_Packages/Darwin/IFW COMPRESSED_PKG_PATH: _CPack_Packages/Darwin/TGZ MACOSX_DEPLOYMENT_TARGET: 13.0 - SDKROOT: /Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk + SDKROOT: /Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk QT_OS_NAME: mac QT_ARCH: clang_64 arch: x86_64 @@ -185,7 +185,7 @@ jobs: echo "/Users/irvinemac/Qt/Tools/QtInstallerFramework/4.3/bin/" >> $GITHUB_PATH else echo "Setting Xcode version" - sudo xcode-select -s "/Applications/Xcode_15.2.app/Contents/Developer/" + sudo xcode-select -s "/Applications/Xcode_16.4.app/Contents/Developer/" echo "Using brew to install ninja" brew install ninja md5sha1sum ccache @@ -699,10 +699,10 @@ jobs: # fail-fast: Default is true, switch to false to allow one platform to fail and still run others fail-fast: false matrix: - os: [macos-13, macos-15] + os: [macos-15-intel, macos-15] include: - - os: macos-13 - binary_os: macos-13 + - os: macos-15-intel + binary_os: macos-15-intel SELF_HOSTED: false BINARY_EXT: dmg COMPRESSED_EXT: tar.gz From ce6024d9cd92ea4ff689718b7cb20e49bbccb8ec Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Mon, 22 Dec 2025 15:57:17 -0700 Subject: [PATCH 06/16] Debugging files that have changed --- .github/workflows/app_build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index 8816ff46e..5db3cf8c2 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -188,7 +188,7 @@ jobs: sudo xcode-select -s "/Applications/Xcode_16.4.app/Contents/Developer/" echo "Using brew to install ninja" - brew install ninja md5sha1sum ccache + brew install md5sha1sum ccache ccache --set-config=cache_dir=$CCACHE_DIR ccache --set-config=max_size=500M @@ -197,6 +197,7 @@ jobs: # The openssl@3 package installed on CI adds these files to the pkgconfig directory # Remove them here so they aren't found instead of the version of OpenSSL built by Conan + ls -alsh /usr/local/lib/pkgconfig/ rm /usr/local/lib/pkgconfig/libcrypto.pc rm /usr/local/lib/pkgconfig/libssl.pc rm /usr/local/lib/pkgconfig/openssl.pc From 467530fc87afe3ccb4d4fbfc9fee978d5f2f537e Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Mon, 22 Dec 2025 16:08:25 -0700 Subject: [PATCH 07/16] Running into issues with certificate already exists again --- .github/workflows/app_build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index 5db3cf8c2..019700d92 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -198,9 +198,9 @@ jobs: # The openssl@3 package installed on CI adds these files to the pkgconfig directory # Remove them here so they aren't found instead of the version of OpenSSL built by Conan ls -alsh /usr/local/lib/pkgconfig/ - rm /usr/local/lib/pkgconfig/libcrypto.pc - rm /usr/local/lib/pkgconfig/libssl.pc - rm /usr/local/lib/pkgconfig/openssl.pc + rm -f /usr/local/lib/pkgconfig/libcrypto.pc + rm -f /usr/local/lib/pkgconfig/libssl.pc + rm -f /usr/local/lib/pkgconfig/openssl.pc fi; fi; @@ -227,6 +227,9 @@ jobs: security set-keychain-settings -lut 21600 $KEYCHAIN_PATH security unlock-keychain -p "${{ secrets.MACOS_KEYCHAIN_PASSWORD }}" $KEYCHAIN_PATH + security find-certificate -a -p + security find-certificate -a -p $KEYCHAIN_PATH + # ----- Import certificates on Keychain ----- security import certificate_application.p12 -P '${{ secrets.MACOS_DEVELOPER_ID_APPLICATION_CERTIFICATE_P12_PASSWORD }}' -A -t cert -f pkcs12 -k $KEYCHAIN_PATH security import certificate_installer.p12 -P '${{ secrets.MACOS_DEVELOPER_ID_INSTALLER_CERTIFICATE_P12_PASSWORD }}' -A -t cert -f pkcs12 -k $KEYCHAIN_PATH From 9e5eebf2fdf16c965268ae5cb0b773f7722200bf Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Mon, 22 Dec 2025 16:15:23 -0700 Subject: [PATCH 08/16] Trying to get past certificate import issue temporarily --- .github/workflows/app_build.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index 019700d92..fe4d7ef98 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -197,10 +197,12 @@ jobs: # The openssl@3 package installed on CI adds these files to the pkgconfig directory # Remove them here so they aren't found instead of the version of OpenSSL built by Conan - ls -alsh /usr/local/lib/pkgconfig/ - rm -f /usr/local/lib/pkgconfig/libcrypto.pc - rm -f /usr/local/lib/pkgconfig/libssl.pc - rm -f /usr/local/lib/pkgconfig/openssl.pc + if [ -d /usr/local/lib/pkgconfig/ ]; then + ls -alsh /usr/local/lib/pkgconfig/ + rm -f /usr/local/lib/pkgconfig/libcrypto.pc + rm -f /usr/local/lib/pkgconfig/libssl.pc + rm -f /usr/local/lib/pkgconfig/openssl.pc + fi; fi; fi; @@ -227,9 +229,6 @@ jobs: security set-keychain-settings -lut 21600 $KEYCHAIN_PATH security unlock-keychain -p "${{ secrets.MACOS_KEYCHAIN_PASSWORD }}" $KEYCHAIN_PATH - security find-certificate -a -p - security find-certificate -a -p $KEYCHAIN_PATH - # ----- Import certificates on Keychain ----- security import certificate_application.p12 -P '${{ secrets.MACOS_DEVELOPER_ID_APPLICATION_CERTIFICATE_P12_PASSWORD }}' -A -t cert -f pkcs12 -k $KEYCHAIN_PATH security import certificate_installer.p12 -P '${{ secrets.MACOS_DEVELOPER_ID_INSTALLER_CERTIFICATE_P12_PASSWORD }}' -A -t cert -f pkcs12 -k $KEYCHAIN_PATH @@ -240,8 +239,8 @@ jobs: brew list aria2 || brew install aria2 aria2c https://www.apple.com/certificateauthority/AppleWWDRCAG2.cer aria2c https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer - security import AppleWWDRCAG2.cer -k $KEYCHAIN_PATH - security import DeveloperIDG2CA.cer -k $KEYCHAIN_PATH + security import AppleWWDRCAG2.cer -k $KEYCHAIN_PATH || true + security import DeveloperIDG2CA.cer -k $KEYCHAIN_PATH || true security find-identity -vvvv $KEYCHAIN_PATH security find-identity -v -p codesigning From 167eb89236be6f701e337bb362ee97abd9be085b Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Mon, 22 Dec 2025 17:45:36 -0700 Subject: [PATCH 09/16] Override specific revision of termcap to get updated cmake minimum --- .github/workflows/app_build.yml | 2 ++ conanfile.py | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index fe4d7ef98..32dbb4b85 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -434,6 +434,8 @@ jobs: pip show setuptools || true pip install setuptools --upgrade pip3 install aqtinstall + aqt list-qt mac desktop --arch 6.5.2 + aqt list-qt mac desktop --modules 6.5.2 ${{ matrix.QT_ARCH }} aqt install-qt --outputdir ./build/Qt-install/ ${{ matrix.QT_OS_NAME }} desktop $QT_VERSION ${{ matrix.QT_ARCH }} -m qtwebchannel qtwebengine qtwebview qt5compat qtpositioning qtcharts fi diff --git a/conanfile.py b/conanfile.py index 65544f903..8bf634981 100644 --- a/conanfile.py +++ b/conanfile.py @@ -43,6 +43,7 @@ def requirements(self): self.requires("geographiclib/1.52") # 76536a9315a003ef3511919310b2fe37 self.requires("swig/4.1.1") # Pending https://github.com/conan-io/conan-center-index/pull/19058 self.requires("tinygltf/2.5.0") # c8b2aca9505e86312bb42aa0e1c639ec + self.requires("termcap/1.3.1#479400c750a869f77b3d2d3a82e06f7d") # need version with updated minimum cmake # self.requires("cli11/2.3.2") # 8ccdf14fb1ad53532d498c16ae580b4b self.requires( From 8fafb4d24470e0628b8a0ec925381a23d340766a Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Mon, 22 Dec 2025 18:04:55 -0700 Subject: [PATCH 10/16] Manually edit lockfile --- conan.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conan.lock b/conan.lock index 6ad38c538..e82c82c89 100644 --- a/conan.lock +++ b/conan.lock @@ -4,7 +4,7 @@ "zlib/1.3.1#af8f2ef3d8e0fddf1975281d7fe43bf6%1705999193.687", "websocketpp/0.8.2#842a0419153a8aa52f3ea3a1da557d38%1695972005.713", "tinygltf/2.5.0#65c28d0a4c3cbd4ef92b08b59df769da%1701621757.442", - "termcap/1.3.1#1986f84bf21dd07ea774b027a3201fcb%1678542508.75", + "termcap/1.3.1#479400c750a869f77b3d2d3a82e06f7d%1755703795.492", "swig/4.1.1#2bb5c79321cbb05bcab525c690d9bf74%1707838669.551", "stb/cci.20230920#9792498b81cf34a90138d239e36b0bf8%1700546289.605", "sqlite3/3.38.5#4b875d4249cdfb4c1235e6b3ea6c18e7%1676251415.466", From b27bf3427138cf357db91c5cd12f56c7817d7687 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Mon, 22 Dec 2025 18:26:55 -0700 Subject: [PATCH 11/16] Supposedly Qt binaries are universal for Mac --- .github/workflows/app_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index 32dbb4b85..1e6dc4d08 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -87,7 +87,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: 13.0 SDKROOT: /Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk QT_OS_NAME: mac - QT_ARCH: arm_64 + QT_ARCH: clang_64 arch: arm64 steps: From cdeb786071172c2d9235944b7543912b24e62fb8 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Tue, 30 Dec 2025 10:48:07 -0700 Subject: [PATCH 12/16] Update to available OpenStudio 3.11-rc2 packages --- FindOpenStudioSDK.cmake | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake index 4cadd384d..5fd82ea76 100644 --- a/FindOpenStudioSDK.cmake +++ b/FindOpenStudioSDK.cmake @@ -4,9 +4,9 @@ set(OPENSTUDIO_VERSION_PATCH 0) set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}") #If this is an official release, leave this "", otherwise put for eg '-rc1' -set(OPENSTUDIO_VERSION_PRERELEASE "-rc1") +set(OPENSTUDIO_VERSION_PRERELEASE "-rc2") # Enter SHA, always, eg "+79857912c4" -set(OPENSTUDIO_VERSION_SHA "+dee62bf9dd") +set(OPENSTUDIO_VERSION_SHA "+15d1db6e7a") # Paths where the cmake-downloaded archives will be put set(OPENSTUDIO_ARCHIVE_DIR "${PROJECT_BINARY_DIR}/OpenStudio-${OPENSTUDIO_VERSION}") @@ -17,9 +17,9 @@ set(OPENSTUDIO_EXT "tar.gz") if(APPLE) set(OPENSTUDIO_PLATFORM "Darwin-${ARCH}") if(ARCH MATCHES "arm64") - set(OPENSTUDIO_EXPECTED_HASH 389a02d7f9d3526454bca74393ac7a6e) + set(OPENSTUDIO_EXPECTED_HASH 4a8cf2cde586d8eb0c05b3ae0c341f10) else() - set(OPENSTUDIO_EXPECTED_HASH TODO_MISSING_TODO) # There is no mac intel (x86_64) installer + set(OPENSTUDIO_EXPECTED_HASH b44431453b8e70f99afe16df8a36591d) endif() elseif(UNIX) @@ -27,27 +27,27 @@ elseif(UNIX) if(LSB_RELEASE_VERSION_SHORT MATCHES "24.04") #set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-22.04-${ARCH}") if (ARCH MATCHES "arm64") - set(OPENSTUDIO_EXPECTED_HASH 2c0dc0cac19f2a09b3cb89a1c1bc52d7) + set(OPENSTUDIO_EXPECTED_HASH dec992baae0e8655c3a73fec0d3ba7d0) else() - set(OPENSTUDIO_EXPECTED_HASH b822fa5d6f51d67dc11b8b0abf363c4c) + set(OPENSTUDIO_EXPECTED_HASH 4c2bc50d72ca6ea97bb0d0e5a597bf97) endif() elseif(LSB_RELEASE_VERSION_SHORT MATCHES "22.04") if (ARCH MATCHES "arm64") - set(OPENSTUDIO_EXPECTED_HASH 1df158161213c1dd7562d489c8576c94) + set(OPENSTUDIO_EXPECTED_HASH TODO_MISSING) else() - set(OPENSTUDIO_EXPECTED_HASH 2aed3184c33125b196ec833a1def9483) + set(OPENSTUDIO_EXPECTED_HASH 6f48484d39ff7140f25ea34eb31a8c42) endif() elseif(LSB_RELEASE_ID_SHORT MATCHES "AlmaLinux") if (ARCH MATCHES "arm64") message(FATAL_ERROR "OpenStudio SDK for AlmaLinux is only built for x86_64") endif() - set(OPENSTUDIO_EXPECTED_HASH 0ed8089fd49054fe237c77070d492502) + set(OPENSTUDIO_EXPECTED_HASH 87fe0c8440bb8f26002aa86ba30802de) else() message(FATAL_ERROR "OpenStudio SDK no longer provides packages for Ubuntu 20.04 or older") endif() elseif(WIN32) - set(OPENSTUDIO_EXPECTED_HASH 85d4677a325285549a850a872e86ffb6) + set(OPENSTUDIO_EXPECTED_HASH TODO_MISSING) set(OPENSTUDIO_PLATFORM "Windows") endif() From 559c1a88e08f27121fc92c34adc2c0e305d4620a Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Wed, 31 Dec 2025 14:22:56 -0700 Subject: [PATCH 13/16] Turn all architectures back on, update to newest RC2 --- .github/workflows/app_build.yml | 63 ++++++++++++++++----------------- FindOpenStudioSDK.cmake | 18 +++++----- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index 1e6dc4d08..1bb71de3f 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -32,39 +32,38 @@ jobs: # fail-fast: Default is true, switch to false to allow one platform to fail and still run others fail-fast: false matrix: - #os: [ubuntu-22.04, ubuntu-24.04, windows-2022, macos-13, macos-arm64] - os: [macos-15-intel, macos-15] + os: [ubuntu-22.04, ubuntu-24.04, windows-2022, macos-15-intel, macos-15] include: - #- os: ubuntu-22.04 - # SELF_HOSTED: false - # PLATFORM_NAME: Linux - # BINARY_EXT: deb - # COMPRESSED_EXT: tar.gz - # BINARY_PKG_PATH: _CPack_Packages/Linux/DEB - # COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ - # QT_OS_NAME: linux - # QT_ARCH: gcc_64 - # arch: x86_64 - #- os: ubuntu-24.04 - # SELF_HOSTED: false - # PLATFORM_NAME: Linux - # BINARY_EXT: deb - # COMPRESSED_EXT: tar.gz - # BINARY_PKG_PATH: _CPack_Packages/Linux/DEB - # COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ - # QT_OS_NAME: linux - # QT_ARCH: gcc_64 - # arch: x86_64 - #- os: windows-2022 - # SELF_HOSTED: false - # PLATFORM_NAME: Windows - # BINARY_EXT: exe - # COMPRESSED_EXT: zip - # BINARY_PKG_PATH: _CPack_Packages/win64/IFW - # COMPRESSED_PKG_PATH: _CPack_Packages/win64/ZIP - # QT_OS_NAME: windows - # QT_ARCH: win64_msvc2019_64 - # arch: x86_64 + - os: ubuntu-22.04 + SELF_HOSTED: false + PLATFORM_NAME: Linux + BINARY_EXT: deb + COMPRESSED_EXT: tar.gz + BINARY_PKG_PATH: _CPack_Packages/Linux/DEB + COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ + QT_OS_NAME: linux + QT_ARCH: gcc_64 + arch: x86_64 + - os: ubuntu-24.04 + SELF_HOSTED: false + PLATFORM_NAME: Linux + BINARY_EXT: deb + COMPRESSED_EXT: tar.gz + BINARY_PKG_PATH: _CPack_Packages/Linux/DEB + COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ + QT_OS_NAME: linux + QT_ARCH: gcc_64 + arch: x86_64 + - os: windows-2022 + SELF_HOSTED: false + PLATFORM_NAME: Windows + BINARY_EXT: exe + COMPRESSED_EXT: zip + BINARY_PKG_PATH: _CPack_Packages/win64/IFW + COMPRESSED_PKG_PATH: _CPack_Packages/win64/ZIP + QT_OS_NAME: windows + QT_ARCH: win64_msvc2019_64 + arch: x86_64 - os: macos-15-intel SELF_HOSTED: false PLATFORM_NAME: Darwin diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake index 5fd82ea76..2d4b4e367 100644 --- a/FindOpenStudioSDK.cmake +++ b/FindOpenStudioSDK.cmake @@ -6,7 +6,7 @@ set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}. #If this is an official release, leave this "", otherwise put for eg '-rc1' set(OPENSTUDIO_VERSION_PRERELEASE "-rc2") # Enter SHA, always, eg "+79857912c4" -set(OPENSTUDIO_VERSION_SHA "+15d1db6e7a") +set(OPENSTUDIO_VERSION_SHA "+d7794add90") # Paths where the cmake-downloaded archives will be put set(OPENSTUDIO_ARCHIVE_DIR "${PROJECT_BINARY_DIR}/OpenStudio-${OPENSTUDIO_VERSION}") @@ -17,9 +17,9 @@ set(OPENSTUDIO_EXT "tar.gz") if(APPLE) set(OPENSTUDIO_PLATFORM "Darwin-${ARCH}") if(ARCH MATCHES "arm64") - set(OPENSTUDIO_EXPECTED_HASH 4a8cf2cde586d8eb0c05b3ae0c341f10) + set(OPENSTUDIO_EXPECTED_HASH baf8f2b746484aad21f55856df78cf37) else() - set(OPENSTUDIO_EXPECTED_HASH b44431453b8e70f99afe16df8a36591d) + set(OPENSTUDIO_EXPECTED_HASH 9256f9061a57010a08cac82e2bb8a0bd) endif() elseif(UNIX) @@ -27,27 +27,27 @@ elseif(UNIX) if(LSB_RELEASE_VERSION_SHORT MATCHES "24.04") #set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-22.04-${ARCH}") if (ARCH MATCHES "arm64") - set(OPENSTUDIO_EXPECTED_HASH dec992baae0e8655c3a73fec0d3ba7d0) + set(OPENSTUDIO_EXPECTED_HASH 0572af8679b61447e5dd0d55811070fb) else() - set(OPENSTUDIO_EXPECTED_HASH 4c2bc50d72ca6ea97bb0d0e5a597bf97) + set(OPENSTUDIO_EXPECTED_HASH 17f79dddea60fdbf41e59a35c948d78a) endif() elseif(LSB_RELEASE_VERSION_SHORT MATCHES "22.04") if (ARCH MATCHES "arm64") - set(OPENSTUDIO_EXPECTED_HASH TODO_MISSING) + set(OPENSTUDIO_EXPECTED_HASH 603e892fd8cfa4be7cdfcaa4f6f44dfe) else() - set(OPENSTUDIO_EXPECTED_HASH 6f48484d39ff7140f25ea34eb31a8c42) + set(OPENSTUDIO_EXPECTED_HASH 59839e3d7a902de908fd2f49051df368) endif() elseif(LSB_RELEASE_ID_SHORT MATCHES "AlmaLinux") if (ARCH MATCHES "arm64") message(FATAL_ERROR "OpenStudio SDK for AlmaLinux is only built for x86_64") endif() - set(OPENSTUDIO_EXPECTED_HASH 87fe0c8440bb8f26002aa86ba30802de) + set(OPENSTUDIO_EXPECTED_HASH 6832b3122470240dfc94129801e8cffa) else() message(FATAL_ERROR "OpenStudio SDK no longer provides packages for Ubuntu 20.04 or older") endif() elseif(WIN32) - set(OPENSTUDIO_EXPECTED_HASH TODO_MISSING) + set(OPENSTUDIO_EXPECTED_HASH 07fbdb6f3b2ef7ea695c64ee00f859be) set(OPENSTUDIO_PLATFORM "Windows") endif() From d5dc9700e89ceb01226f1b93e9f2b5d0f6813404 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Thu, 1 Jan 2026 15:59:03 -0700 Subject: [PATCH 14/16] Work around https://github.com/NREL/OpenStudio/issues/5574, try to avoid SIGPIPE error in CI --- src/openstudio_app/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/openstudio_app/CMakeLists.txt b/src/openstudio_app/CMakeLists.txt index 5436c49bd..b292ea9dc 100644 --- a/src/openstudio_app/CMakeLists.txt +++ b/src/openstudio_app/CMakeLists.txt @@ -445,7 +445,7 @@ if( APPLE ) install(CODE [[ execute_process( - COMMAND echo "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" + COMMAND "${CMAKE_COMMAND}" -E echo "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" COMMAND "${CMAKE_COMMAND}" -E create_symlink "../../../../../../../Frameworks" @@ -471,6 +471,10 @@ if( APPLE ) "../../../lib/$" "${CMAKE_INSTALL_PREFIX}/OpenStudioApp.app/Contents/Frameworks/$" + COMMAND "${CMAKE_COMMAND}" -E create_symlink + "../lib/$" + "${CMAKE_INSTALL_PREFIX}/Ruby/$" + COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_INSTALL_PREFIX}/bin" COMMAND_ECHO STDOUT From 0596a48dad99a4055ab7dd0baff652a7273764d2 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Thu, 1 Jan 2026 16:59:06 -0700 Subject: [PATCH 15/16] Separate execute_process to echo directory to avoid broken pipe --- src/openstudio_app/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/openstudio_app/CMakeLists.txt b/src/openstudio_app/CMakeLists.txt index b292ea9dc..c347cf674 100644 --- a/src/openstudio_app/CMakeLists.txt +++ b/src/openstudio_app/CMakeLists.txt @@ -444,9 +444,14 @@ if( APPLE ) # TODO: We can also just symlink libopenstudio.lib into the OpenStudioApp.app/Contents/Frameworks directory instead of copying install(CODE [[ + # print the CMAKE_INSTALL_PREFIX for debugging, use separate `execute_process` to avoid broken pipes between commands execute_process( COMMAND "${CMAKE_COMMAND}" -E echo "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" + COMMAND_ECHO STDOUT + ) + + execute_process( COMMAND "${CMAKE_COMMAND}" -E create_symlink "../../../../../../../Frameworks" "${CMAKE_INSTALL_PREFIX}/OpenStudioApp.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app/Contents/Frameworks" @@ -481,7 +486,7 @@ if( APPLE ) COMMAND_ERROR_IS_FATAL ANY ) - # We break it into two `execute_process`es so that there is no race condition between the make_directory above and the create_symlink below + # separate `execute_process`es so that there is no race condition between the make_directory above and the create_symlink below execute_process( COMMAND "${CMAKE_COMMAND}" -E create_symlink "../OpenStudioApp.app/Contents/MacOS/$" From eb725439f62ad7a801f5282185d7f08862d13282 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Sat, 10 Jan 2026 15:39:20 -0700 Subject: [PATCH 16/16] Update to OS 3.11.0-rc3 --- FindOpenStudioSDK.cmake | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake index 2d4b4e367..410bde51d 100644 --- a/FindOpenStudioSDK.cmake +++ b/FindOpenStudioSDK.cmake @@ -4,9 +4,9 @@ set(OPENSTUDIO_VERSION_PATCH 0) set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}") #If this is an official release, leave this "", otherwise put for eg '-rc1' -set(OPENSTUDIO_VERSION_PRERELEASE "-rc2") +set(OPENSTUDIO_VERSION_PRERELEASE "-rc3") # Enter SHA, always, eg "+79857912c4" -set(OPENSTUDIO_VERSION_SHA "+d7794add90") +set(OPENSTUDIO_VERSION_SHA "+7d1f8bdb36") # Paths where the cmake-downloaded archives will be put set(OPENSTUDIO_ARCHIVE_DIR "${PROJECT_BINARY_DIR}/OpenStudio-${OPENSTUDIO_VERSION}") @@ -17,9 +17,9 @@ set(OPENSTUDIO_EXT "tar.gz") if(APPLE) set(OPENSTUDIO_PLATFORM "Darwin-${ARCH}") if(ARCH MATCHES "arm64") - set(OPENSTUDIO_EXPECTED_HASH baf8f2b746484aad21f55856df78cf37) + set(OPENSTUDIO_EXPECTED_HASH 37d5d0aa39a53d510ef80ff20cd259ab) else() - set(OPENSTUDIO_EXPECTED_HASH 9256f9061a57010a08cac82e2bb8a0bd) + set(OPENSTUDIO_EXPECTED_HASH 5dca5e48f72c59752cb1ff69bc096e92) endif() elseif(UNIX) @@ -27,27 +27,27 @@ elseif(UNIX) if(LSB_RELEASE_VERSION_SHORT MATCHES "24.04") #set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-22.04-${ARCH}") if (ARCH MATCHES "arm64") - set(OPENSTUDIO_EXPECTED_HASH 0572af8679b61447e5dd0d55811070fb) + set(OPENSTUDIO_EXPECTED_HASH d34cc5bc2852b2ddbdcfb59aad875a37) else() - set(OPENSTUDIO_EXPECTED_HASH 17f79dddea60fdbf41e59a35c948d78a) + set(OPENSTUDIO_EXPECTED_HASH ac2e2a7bc2659211425e60cdd703ce67) endif() elseif(LSB_RELEASE_VERSION_SHORT MATCHES "22.04") if (ARCH MATCHES "arm64") - set(OPENSTUDIO_EXPECTED_HASH 603e892fd8cfa4be7cdfcaa4f6f44dfe) + set(OPENSTUDIO_EXPECTED_HASH bc9671271df500b488fa72a138d0c3d3) else() - set(OPENSTUDIO_EXPECTED_HASH 59839e3d7a902de908fd2f49051df368) + set(OPENSTUDIO_EXPECTED_HASH de7c9fcfd5398a3726757ad7cf7c4fa3) endif() elseif(LSB_RELEASE_ID_SHORT MATCHES "AlmaLinux") if (ARCH MATCHES "arm64") message(FATAL_ERROR "OpenStudio SDK for AlmaLinux is only built for x86_64") endif() - set(OPENSTUDIO_EXPECTED_HASH 6832b3122470240dfc94129801e8cffa) + set(OPENSTUDIO_EXPECTED_HASH 7fb41aab9c9eadb1018a87c5cd171d3b) else() message(FATAL_ERROR "OpenStudio SDK no longer provides packages for Ubuntu 20.04 or older") endif() elseif(WIN32) - set(OPENSTUDIO_EXPECTED_HASH 07fbdb6f3b2ef7ea695c64ee00f859be) + set(OPENSTUDIO_EXPECTED_HASH bb4c6429e35e9ecbbbea015c1a1ef48a) set(OPENSTUDIO_PLATFORM "Windows") endif()