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

Update #232 #249

Merged
merged 3 commits into from
Mar 1, 2024
Merged

Update #232 #249

merged 3 commits into from
Mar 1, 2024

Conversation

HalosGhost
Copy link
Collaborator

This supersedes #232; really all it does is add my DCO sign-off to each commit from #232, update the relevant documentation and workflows, and rename the scripts to be as clear as possible.

@HalosGhost
Copy link
Collaborator Author

@maurermi and @madars, mind taking a brief look at this? I can't quite tell if this last CI check failing here is because the docker workflow is building against the currently-published images (which don't have the new search-path defined in CMakeLists.txt, of course), or something setup incorrectly. With the small tweaks I've made, everything builds fine locally (including forcing a build of the docker images locally) so I suspect my intuition is correct, but I'd love a second set of eyes on it.

@maurermi
Copy link
Collaborator

@HalosGhost I think what's happening is that now the CMake build is not searching the prefix/ directory for libraries and associated header files -- making an attempt to fix this now

@HalosGhost
Copy link
Collaborator Author

But to be clear, that's only happening for the docker pull/build CI step (e.g., the full build step works fine using the updated files).

@maurermi
Copy link
Collaborator

Yeah, the build-docker.sh script is different in that it goes based off of the Dockerfile, which does not set the -DCMAKE_PREFIX_PATH flag AFAIK. Using the build-docker.sh script I have been able to recreate the error given by the CI

@HalosGhost
Copy link
Collaborator Author

HalosGhost commented Feb 29, 2024

oh, that's true for me as well; to fix, I just commented out the line in Dockerfile which specifies the upstream URL (forcing a local build), which succeeds. If fixing that would fix the environment would fix the CI though, I'm all for it.

Copy link
Collaborator

@maurermi maurermi left a comment

Choose a reason for hiding this comment

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

T-ACK, with the change to the Dockerfile to include "prefix" within CMAKE_PREFIX_PATH, then this looks to me to work properly. Added some other minor comments, but the only thing that really needs addressing is the Dockerfile IMO

@maurermi
Copy link
Collaborator

maurermi commented Mar 1, 2024

LGTM -- think this is ready to merge if there is consensus

@HalosGhost
Copy link
Collaborator Author

LGTM -- think this is ready to merge if there is consensus

I'm still getting build errors locally, but I think I may know what's causing them. If I'm right (and it's an oddity with my local setup), then I'll merge ASAP.

@HalosGhost HalosGhost marked this pull request as ready for review March 1, 2024 16:22
@HalosGhost
Copy link
Collaborator Author

Indeed the errors above seem to be due to some oddity of my setup; running in act locally has no issues at all (nor does the GH CI, obviously). @maurermi great catch on the environment update. Merging!

@HalosGhost HalosGhost merged commit 83e50ef into mit-dci:trunk Mar 1, 2024
6 checks passed
@HalosGhost HalosGhost deleted the pr/232 branch March 1, 2024 16:23
@HalosGhost HalosGhost mentioned this pull request Mar 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants