Merge to master for 1.7.0 #652
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix the crash in schedules view
Add search bar to OSCollapsibleItemList
…ck up for increased clarity
…priate) + Do same for Refrigeration controller
Fix MacOS CI
…id "Floor" Surface to assign to, make a modal dialog to pick one. This isn't terribly exciting for the SwimmingPoolIndoor object itself, but this opens the possibility of duplicating the approach to other ModelObjects requiring a mandatory model-dependent parameter.
Fix #482 - SwimmingPool:Indoor icon + policy and implement a way to deal with ModelObjects having a model-dependent parameter
…ration Fix #560 - Refactor HVACSystems view to hide unavailable controls, allow zooming display on VRF + Refrigeration tab
…d OS SDK)
This includes the Qt install, the .ccache (ccache) folder on Unix, the OpenStudio SDK tar.gz, and previous build artifacts
# TODO: problem is that caching is limited to 10 GB. The build folder takes 3-4 GB per runner, and we have 4 of them that try to cache
# Perhaps we should just cache the ccache. Anyways, for incremental builds triggered one after another, cache eviction hasn't happened yet and all of them do a cache hit
# Build times improvements
# * Ubuntu: 41 min -> 10 min
# * macos-13 (where conan binaries needed to be built): 1h15 -> 27min (shaving 23 min due to conan cache only)
# Another thing is that if the cache is hit, then it's not saved in post build. Fine for the conan cache, but probably want an update for the build stuff
# Note that cache is immutable, so that'd mean uploading a NEW cache entry (so potentially 4GB again)
RULE_LAUNCH_COMPILE is now flagged as an internal implementation detail, and it makes the compile of the RC file fail on windows. See the note on https://cmake.org/cmake/help/latest/prop_gbl/RULE_LAUNCH_COMPILE.html > Note This property is intended for internal use by ctest(1). Projects and developers should use the <LANG>_COMPILER_LAUNCHER target properties or the associated CMAKE_<LANG>_COMPILER_LAUNCHER variables instead. ``` [ 96%][543/560] Building RC object src\openstudio_app\CMakeFiles\OpenStudioApp.dir\OpenStudioApp.rc.res FAILED: src/openstudio_app/CMakeFiles/OpenStudioApp.dir/OpenStudioApp.rc.res C:/bin/ccache.exe C:/PROGRA~1/CMake/bin/cmcldeps.exe RC C:\src\OpenStudioApplication\build\src\openstudio_app\OpenStudioApp.rc src\openstudio_app\CMakeFiles\OpenStudioApp.dir\OpenStudioApp.rc.res.d src\openstudio_app\CMakeFiles\OpenStudioApp.dir\OpenStudioApp.rc.res "Note: including file: " "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.36.32532/bin/Hostx64/x64/cl.exe" C:\PROGRA~2\WI3CF2~1\10\bin\100190~1.0\x64\rc.exe -DBOOST_ALL_NO_LIB -DBOOST_STACKTRACE_USE_NOOP -DBOOST_STACKTRACE_USE_WINDBG -DBOOST_STACKTRACE_USE_WINDBG_CACHED -DBOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN7 -DBOOST_WINAPI_DEFINE_VERSION_MACROS -DLIBXML_STATIC -DNINJA=1 -DNOMINMAX -DQT_CORE5COMPAT_LIB -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_POSITIONING_LIB -DQT_PRINTSUPPORT_LIB -DQT_QMLINTEGRATION_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICKWIDGETS_LIB -DQT_QUICK_LIB -DQT_SVG_LIB -DQT_WEBCHANNEL_LIB -DQT_WEBENGINECORE_LIB -DQT_WEBENGINEWIDGETS_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -DSHARED_OS_LIBS -DUNICODE -DWIN32 -DWIN32_LEAN_AND_MEAN -DWIN64 -D_AFXDLL -D_CRT_SECURE_NO_WARNINGS -D_ENABLE_EXTENDED_ALIGNED_STORAGE -D_NO_ASYNCRTIMP -D_NO_PPLXIMP -D_SCL_SECURE_NO_WARNINGS -D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS -D_SILENCE_FPOS_SEEKPOS_DEPRECATION_WARNING -D_UNICODE -D_WIN64 -Dmodel_editor_EXPORTS -I C:\src\OpenStudioApplication -I C:\src\OpenStudioApplication\src -I C:\src\OpenStudioApplication\build -I C:\src\OpenStudioApplication\build\src -I C:\src\OpenStudioApplication\src\qtwinmigrate -I C:\src\OpenStudioApplication\build\src\openstudio_app -I C:\Qt\6.6.1\msvc2019_64\include\QtZlib -I C:\Qt\6.6.1\msvc2019_64\include\QtConcurrent -I C:\Qt\6.6.1\msvc2019_64\include\QtGui\6.6.1\QtGui -I C:\Qt\6.6.1\msvc2019_64\include\QtCore -I C:\Qt\6.6.1\msvc2019_64\include -I C:\Qt\6.6.1\msvc2019_64\include\QtWidgets -I C:\Qt\6.6.1\msvc2019_64\include\QtGui -I C:\Qt\6.6.1\msvc2019_64\include\QtXml -I C:\Qt\6.6.1\msvc2019_64\include\QtNetwork -I C:\Qt\6.6.1\msvc2019_64\include\QtPrintSupport -I C:\Qt\6.6.1\msvc2019_64\include\QtWebEngineCore -I C:\Qt\6.6.1\msvc2019_64\include\QtQuick -I C:\Qt\6.6.1\msvc2019_64\include\QtQml -I C:\Qt\6.6.1\msvc2019_64\include\QtQmlIntegration -I C:\Qt\6.6.1\msvc2019_64\include\QtQmlModels -I C:\Qt\6.6.1\msvc2019_64\include\QtOpenGL -I C:\Qt\6.6.1\msvc2019_64\include\QtWebChannel -I C:\Qt\6.6.1\msvc2019_64\include\QtPositioning -I C:\Qt\6.6.1\msvc2019_64\include\QtWebEngineWidgets -I C:\Qt\6.6.1\msvc2019_64\include\QtQuickWidgets -I C:\src\OpenStudioApplication\build\OpenStudio-3.7.0\OpenStudio-3.7.0+d5269793f1-Windows\include -I C:\src\OpenStudioApplication\build\OpenStudio-3.7.0\OpenStudio-3.7.0+d5269793f1-Windows\include\openstudio -I C:\.conan\117565\1\include -I C:\Users\julien\.conan\data\zlib\1.2.12\_\_\package\5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b\include -I C:\Users\julien\.conan\data\bzip2\1.0.8\_\_\package\53b5fd22ba061620078deefdae9a437c5f693201\include -I C:\Users\julien\.conan\data\jsoncpp\1.9.5\_\_\package\5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b\include -I C:\Users\julien\.conan\data\cpprestsdk\2.10.18\_\_\package\bc796986be5f5a06bb4dfcaa8b7ab497284d57e9\include -I C:\Users\julien\.conan\data\openssl\1.1.1o\_\_\package\5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b\include -I C:\Users\julien\.conan\data\websocketpp\0.8.2\_\_\package\5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9\include -I C:\Users\julien\.conan\data\pugixml\1.12.1\_\_\package\5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b\include -I C:\Users\julien\.conan\data\libxml2\2.9.14\_\_\package\77c83943028aeda4b502557bd0b671409529a8bf\include -I C:\Users\julien\.conan\data\libxml2\2.9.14\_\_\package\77c83943028aeda4b502557bd0b671409529a8bf\include\libxml2 -I C:\Users\julien\.conan\data\libiconv\1.16\_\_\package\5a61a86bb3e07ce4262c80e1510f9c05e9b6d48b\include -I C:\Users\julien\.conan\data\fmt\9.1.0\_\_\package\8c0a53bc9b0a08b9311ca89254091ba7fb4f89b4\include -I C:\Qt\6.6.1\msvc2019_64\mkspecs\win32-msvc -I C:\Qt\6.6.1\msvc2019_64\include\QtCore5Compat -I C:\Qt\6.6.1\msvc2019_64\include\QtSvg -DWIN32 /wd4503 /wd4251 /wd4275 /wd4267 /WX /fo src\openstudio_app\CMakeFiles\OpenStudioApp.dir\OpenStudioApp.rc.res C:\src\OpenStudioApplication\build\src\openstudio_app\OpenStudioApp.rc cl : Command line warning D9002 : ignoring unknown option '/fo' c1: fatal error C1083: Cannot open source file: 'src\openstudio_app\CMakeFiles\OpenStudioApp.dir\OpenStudioApp.rc.res.dep.obj ': No such file or directory OpenStudioApp.rc [ 98%][552/560] Building CXX object src\openstudio_app\CMa...\OpenStudioApp_tests.dir\test\OpenStudioAppFixture.cpp.obj ninja: build stopped: subcommand failed. ```
… message) + Check if windows ccache works
```
##[debug]::debug::Search path 'D:\a\OpenStudioApplication\OpenStudioApplication'
##[debug]D:\a\OpenStudioApplication\OpenStudioApplication\CMakeLists.txt
##[debug][Error: EACCES: permission denied, lstat 'D:\a\OpenStudioApplication\OpenStudioApplication\conan-cache\short\77a911\1\bin\msys64\dev\fd'] {
##[debug] errno: -4092,
##[debug] code: 'EACCES',
##[debug] syscall: 'lstat',
##[debug] path: 'D:\\a\\OpenStudioApplication\\OpenStudioApplication\\conan-cache\\short\\77a911\\1\\bin\\msys64\\dev\\fd'
##[debug]}
```
…n key cache not hit
Redo app build caching
Bad workaround for #659
…ometry preview / results tab
1.7.0 rc2 fixes
Add help menu item to debug webgl issues
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.