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

ci: Clean dup source tree for CRT #4882

Merged
merged 3 commits into from
Nov 11, 2024
Merged

ci: Clean dup source tree for CRT #4882

merged 3 commits into from
Nov 11, 2024

Conversation

dougch
Copy link
Contributor

@dougch dougch commented Nov 8, 2024

Resolved issues:

#4881

Description of changes:

CMake is looking for a file in a duplicate source tree (that needs to be cleaned from our container). This PR removes /opt/s2n-tls.

Call-outs:

Testing:

How is this change tested : CI specific job

Is this a refactor change? If so, how have you proved that the intended behavior hasn't changed?

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@github-actions github-actions bot added the s2n-core team label Nov 8, 2024
@dougch dougch marked this pull request as ready for review November 8, 2024 21:52
@toidiu
Copy link
Contributor

toidiu commented Nov 8, 2024

CMake is looking for a file in a duplicate source tree (that needs to be cleaned from our container). This PR bumps to ubuntu22 and removes /opt/s2n-tls.

Which cmake is look for this? Is it CRT's cmake and can you link. Why is this issue happening now?

Comment on lines +33 to +34
# Make sure there isn't another source tree hanging around.
rm -rf /opt/s2n-tls || true
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you expand on why we need to do this, why the failure started happening and what happens if we accidentally remove this line.

Maybe also link to your investigation issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The pre-built docker containers have an s2n-tls clone that was used to build and pre-install the libcrypto's. We're not cleaning that up at the end of the docker build process (issue coming). This copy of s2n-tls is ~1 month old, and is being found by the aws-c-io find_package portion of CRT's build. The recent changes appear to have caused a behavior change in cmake.

@dougch
Copy link
Contributor Author

dougch commented Nov 8, 2024

CMake is looking for a file in a duplicate source tree (that needs to be cleaned from our container). This PR bumps to ubuntu22 and removes /opt/s2n-tls.

Which cmake is look for this? Is it CRT's cmake and can you link. Why is this issue happening now?

Yes, CRT's cmake. I have not done the work to figure out how CMake's search paths and preference order were affected by the recent changes.

@dougch dougch requested a review from toidiu November 8, 2024 23:53
@dougch dougch changed the title ci: run CRT on ubuntu22 and clean potential source tree. ci: Clean dup source tree for CRT Nov 11, 2024
@dougch dougch enabled auto-merge (squash) November 11, 2024 17:36
@dougch dougch merged commit b589fa4 into aws:main Nov 11, 2024
37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants