From 96abf77252ffd4742f8bc625a42eb41c128529de Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Sat, 31 Jan 2026 11:11:37 -0700 Subject: [PATCH 1/3] Update actions to work after clearing cache, bump to RC2 (#854) --- .github/workflows/app_build.yml | 4 ++-- CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index 57e707cb7..04df44fd8 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -433,8 +433,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 list-qt ${{ matrix.QT_OS_NAME }} desktop --arch $QT_VERSION + aqt list-qt ${{ matrix.QT_OS_NAME }} desktop --modules $QT_VERSION ${{ 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/CMakeLists.txt b/CMakeLists.txt index 453b0aa98..8bea07d19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,7 +272,7 @@ endif() # TODO: Modify the more specific variables as needed to indicate prerelease, etc # Keep in beta in-between release cycles. Set to empty string (or comment out) for official) -set(PROJECT_VERSION_PRERELEASE "rc1") +set(PROJECT_VERSION_PRERELEASE "rc2") # OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag set(OPENSTUDIOAPPLICATION_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") From 21e980df22d46620f66693f4af95739a92f48204 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Thu, 12 Feb 2026 21:00:04 -0700 Subject: [PATCH 2/3] Remove rc2 label --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bea07d19..817dc8b5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,7 +272,7 @@ endif() # TODO: Modify the more specific variables as needed to indicate prerelease, etc # Keep in beta in-between release cycles. Set to empty string (or comment out) for official) -set(PROJECT_VERSION_PRERELEASE "rc2") +set(PROJECT_VERSION_PRERELEASE "") # OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag set(OPENSTUDIOAPPLICATION_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") From 04d72fbae88609d5d9b915c48e466875352738a5 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Tue, 17 Feb 2026 17:44:30 -0700 Subject: [PATCH 3/3] Update CMakeLists.txt Online editor screwed up resolving conflicts, fixing here --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 153dc4c96..817dc8b5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,11 +272,7 @@ endif() # TODO: Modify the more specific variables as needed to indicate prerelease, etc # Keep in beta in-between release cycles. Set to empty string (or comment out) for official) -<<<<<<< develop set(PROJECT_VERSION_PRERELEASE "") -======= -set(PROJECT_VERSION_PRERELEASE "rc2") ->>>>>>> master # OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag set(OPENSTUDIOAPPLICATION_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")