Skip to content

PR to master for 1.8.0 #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
jmarrec merged 187 commits into from
Sep 20, 2024
Merged

PR to master for 1.8.0 #755

jmarrec merged 187 commits into from
Sep 20, 2024

Conversation

@macumber
Copy link
Collaborator

@macumber macumber commented Sep 18, 2024

No description provided.

macumber and others added 30 commits April 27, 2024 14:06
@macumber
Updated floorspaceJS with fixes from @manuvarkey on openstudiocoaliti…
090fbc3 
…on/floorspace.js#11
@macumber
Merge branch 'develop' of github.com:openstudiocoalition/OpenStudioAp…
cf28737 
…plication into develop
@jmarrec
Naive copy conanfile.py from OpenStudio and BUILDING.md
905cc85
@jmarrec
Use OS 3.8.0-rc2, update conanfile (don't need cli11), update BUILDIN…
926c050 
…G.md
@jmarrec
First pass at updating workflow
9d7a896
@jmarrec
Add a lockfile
71ece1e
@github-actions
@manuvarkey has signed the CLA in #713
44a0098
@jmarrec
mac avoid boost deprecated error + windows call conanbuild.bat to act…
fc81d7a 
…ivate vcvars of gcc (msys) is picked up
@jmarrec
Temporary: disable ubuntu and windows which are passing
f8acd6b
@jmarrec
Remove CLI11 from cmakelist
036b0f6
@jmarrec
Fixup the CPack issue by using the ARCH we already compute via uname...
b482f2b
@jmarrec
Workaround for mac arm64 where the OS SDK extracted tar.gz has a diff…
2f6d046 
…erent SHA compared to github
@jmarrec
Workaround 2 for mac arm64 where the OS SDK extracted tar.gz has a di…
d393559 
…fferent SHA compared to github
@jmarrec
Revert "Temporary: disable ubuntu and windows which are passing"
94960f9 
This reverts commit f8acd6b.
@jmarrec
debug statement for future ref
bbd89b2
@jmarrec
Merge pull request #712 from openstudiocoalition/conan_v2_os_380_rc2
cb44b69 
Conan v2 + OS SDK 3.8.0-rc2
@jmarrec
Implement org, repo, etc
81d6ee9 
Needs NatLabRockies/OpenStudio#5126
@macumber
Updates for SketchUp 2024
bfcf310
@jmarrec
One more File.exists
377c9d3
@jmarrec
Fixup looking for system ruby for running tests
48d1f9d
@macumber
Use same major and minor version of Qt as SketchUp
50f155a
@macumber
Don't run workflow if PR is draft
2751769
@macumber
Trigger CI when PR is marked ready for review
f0b8a25
@macumber
Update to official 3.8.0 packages
598c17d
@macumber
Update resources
fff53cf
@jmarrec
Update .github/workflows/app_build.yml
55cfab6
@jmarrec
Unrelated update AboutBox and model_editor fallbacks for Qt6
6473833
@jmarrec
Allow passing QT_VERSION (default 6.5.3) - Update Qt version in about…
d4f56e7 
… box (dynamically)
@jmarrec
#612 - Proof of concept
fea6097
@jmarrec
Add a new QAction to display additional props and connect it to MainW…
66e21e8 
…indow
jmarrec added 26 commits September 4, 2024 11:28
@jmarrec
#633 - Modernize ApplyCopyright to use a short license string
291243a
@jmarrec
Update AboutBoxes to have a configurable Year so it doesn't fall out …
17f8dfa 
…of sync + add Qt6Chars and Qt6OpenGLWidgets
@jmarrec
[chore] Apply short-style copyright, hopefully for the last time
c8c0ff6
@jmarrec
Add to .git-blame-ignore-revs
ad6556e
@jmarrec
Revert a whitespace change
074738c
@jmarrec
Merge pull request #740 from openstudiocoalition/739_Ubuntu2404
2277fd5 
Fix #739 - Issues with Ubuntu 24.04: unmet apt dependencies, icon not showing
@jmarrec
Merge pull request #741 from openstudiocoalition/633_ShortStyleCopyright
58ecf75 
Fix #633 - Apply short style copyright and hopefully for the last time
@jmarrec
bump to rc3
44f381f
@jmarrec
Fix #744 - Update os.icns to the new icon
beaf89e
@jmarrec
Use ${CURRENT_YEAR} in OpenStudioApp.rc.in
4db37ff
@jmarrec
Try to fix #745 by signing QtWengineProcess with `com.apple.security.…
f804c9a 
…cs.disable-executable-page-protection`
@jmarrec
Try to fix #745 in the right spot (previous attempt, qtwebenginecore …
288291e 
…wasn't there yet)
@jmarrec
#745 - sign the right exe
0d4e255
@jmarrec
Try more entitlements
2084dc9 
cf https://forum.qt.io/topic/106949/qtwebengine-signing-issues/3?_=1725461799200&lang=en-GB
@jmarrec
Use the Qt install QtWebEngineProcess.entitlements directly
665e77b
@jmarrec
Merge pull request #746 from openstudiocoalition/744_fixup_icon
46ffa59 
Fix #744  Fix #745 - fixup icon and Can't see QtWebEngine pages on macOS
@jmarrec
#747 - fixup crash when loading ShoeboxModel from the measures/workfl…
02903e2 
…ow tab
@jmarrec
Avoid trying to loadModel when you can check if file exists first
35a87ec
@jmarrec
Merge pull request #748 from openstudiocoalition/747_CrashShoebox
c658cda 
Fix #747 - crash shoebox
@jmarrec
Add icon, product url, and "Launch OpenStudioApp" at end of install f…
be76dfb 
…or IFW
@jmarrec
Add a license component for IFW (hidden, required, but will trigger t…
b7146fc 
…he License page)
@jmarrec
Make OpenStudioApp component required...
88693b8
@jmarrec
Set IFW title [skip ci]
53e271e
@jmarrec
Merge pull request #749 from openstudiocoalition/improve_installer
fee5274 
Improve installer
@jmarrec
Set Version to OpenStudioApp 1.8.0
5aad610
@jmarrec
Add an Ubuntu-2404 runner (#754)
2722e3e 
* Allow building on Ubuntu 24.04 by downloading the 22.04 ubuntu package

* Add an Ubuntu 24.04 runner
@macumber macumber requested a review from jmarrec September 18, 2024 02:42
@jmarrec jmarrec merged commit deabd36 into master Sep 20, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Sep 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jmarrec jmarrec jmarrec approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@macumber @jmarrec @manuvarkey