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

Branch 22.09 merge 22.08 #336

Merged

Conversation

mdemoret-nv
Copy link
Contributor

@mdemoret-nv mdemoret-nv commented Sep 8, 2022

Fixes the conflict in PR #335

To avoid unnecessary IWYU errors due to the merge, clang was updated to version 14 and include-what-you-use=0.18. So this also closes #337

mdemoret-nv and others added 3 commits September 7, 2022 15:02
When compiling with SRF 22.08 conda package, some modifications are necessary to get the compilation to succeed.

Authors:
  - Michael Demoret (https://github.com/mdemoret-nv)

Approvers:
  - David Gardner (https://github.com/dagardner-nv)
  - Bartley Richardson (https://github.com/BartleyR)

URL: nv-morpheus#332
@mdemoret-nv mdemoret-nv added bug Something isn't working non-breaking Non-breaking change labels Sep 8, 2022
@mdemoret-nv mdemoret-nv requested review from a team as code owners September 8, 2022 19:46
Copy link
Contributor

@dagardner-nv dagardner-nv left a comment

Choose a reason for hiding this comment

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

LGTM, I would remove this line from ci/scripts/jenkins/checks.sh:

export IWYU_DIR="${WORKSPACE_TMP}/iwyu"

And remove IWYU_DIR from the rm on line 25

@mdemoret-nv
Copy link
Contributor Author

LGTM, I would remove this line from ci/scripts/jenkins/checks.sh:

export IWYU_DIR="${WORKSPACE_TMP}/iwyu"

And remove IWYU_DIR from the rm on line 25

Done

@mdemoret-nv mdemoret-nv merged commit 8455a8c into nv-morpheus:branch-22.09 Sep 9, 2022
@mdemoret-nv mdemoret-nv deleted the branch-22.09-merge-22.08 branch September 9, 2022 23:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working non-breaking Non-breaking change
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

[FEA] Upgrade Clang to 14 and Use Conda to Install
2 participants