Skip to content
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.

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

Conan v2 + OS SDK 3.8.0-rc2 #712

Merged
merged 12 commits into from
May 13, 2024
Merged

Conan v2 + OS SDK 3.8.0-rc2 #712

merged 12 commits into from
May 13, 2024

Conversation

jmarrec
Copy link
Collaborator

@jmarrec jmarrec commented May 7, 2024

No description provided.

@jmarrec jmarrec requested a review from macumber May 7, 2024 15:43
@jmarrec jmarrec self-assigned this May 7, 2024
Comment on lines +5 to +8
```shell
conan --version
conan remote add -f nrel-v2 http://conan.openstudio.net/artifactory/api/conan/conan-v2
```
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Step 1

Comment on lines +12 to +14
```shell
conan install . --output-folder=../OSApp-build-release --build=missing -c tools.cmake.cmaketoolchain:generator=Ninja -s compiler.cppstd=20 -s build_type=Release
```
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Step 2, at root of repo, with conan2

Comment on lines +71 to +75
```
cmake --preset conan-release \
-DQT_INSTALL_DIR:PATH=/opt/Qt/6.6.3/gcc_64 \
-DBUILD_PACKAGE:BOOL=ON
```
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Step 3, at root still

Comment on lines +77 to +81
Building

```
cmake --build --preset conan-release
```
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Step 4, at root still.

Comment on lines +461 to +478
if [ "${{ matrix.SELF_HOSTED }}" == "true" ]; then
# TODO: temp... this is unfortunate but the OS SDK arm64 rc2 package has a different sha when extracted...
# OpenStudio-3.8.0-rc2+af997f4fef-Darwin-x86_64.tar.gz on github, but when extracted it's OpenStudio-3.8.0-rc2+06d9d975e1-Darwin-arm64
cmake --preset conan-release -DQT_INSTALL_DIR:PATH=${{ env.QT_INSTALL_DIR }} \
-DBUILD_DOCUMENTATION:BOOL=${{ env.BUILD_DOCUMENTATION }} \
-DBUILD_PACKAGE:BOOL=${{ env.BUILD_PACKAGE }} \
-DANALYTICS_API_SECRET:STRING=${{ secrets.ANALYTICS_API_SECRET }} \
-DANALYTICS_MEASUREMENT_ID:STRING=${{ secrets.ANALYTICS_MEASUREMENT_ID }} || true

ls $(pwd)/build/OpenStudio-3.8.0 || true
OS_DIR=$(find "$(pwd)/build/OpenStudio-3.8.0" -name openstudioConfig.cmake)
OS_DIR=$(dirname $OS_DIR)
cmake --preset conan-release -DQT_INSTALL_DIR:PATH=${{ env.QT_INSTALL_DIR }} \
-DBUILD_DOCUMENTATION:BOOL=${{ env.BUILD_DOCUMENTATION }} \
-DBUILD_PACKAGE:BOOL=${{ env.BUILD_PACKAGE }} \
-DANALYTICS_API_SECRET:STRING=${{ secrets.ANALYTICS_API_SECRET }} \
-DANALYTICS_MEASUREMENT_ID:STRING=${{ secrets.ANALYTICS_MEASUREMENT_ID }} -Dopenstudio_DIR:PATH=$OS_DIR
fi
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to remove that block soon. OS SDK 3.8.0-RC2 has a different extracted folder (different SHA) than the github hosted tar.gz and that pwned me real bad.

@jmarrec
Copy link
Collaborator Author

jmarrec commented May 13, 2024

Alright, I got all platforms to build but separately, reverted my temp commit that disabled ubuntu and windows, letting a final CI run that hopefully should be all green, and then we can merge this.

@jmarrec jmarrec merged commit cb44b69 into develop May 13, 2024
8 checks passed
@jmarrec jmarrec deleted the conan_v2_os_380_rc2 branch May 13, 2024 11:57
@github-actions github-actions bot locked and limited conversation to collaborators May 13, 2024
@macumber
Copy link
Collaborator

@jmarrec I built develop with no major issues, thanks for the great instructions! I was able to load the binaries into SketchUp 2024 which is a first. Now it is on to debugging the Ruby API changes (apparently no more exists? for File...). Thanks!

@jmarrec
Copy link
Collaborator Author

jmarrec commented May 14, 2024

Yeah some deprecated stuff was removed in 3.x. File.exists? => File.exist?, tiny stuff like this

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants