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.

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

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a968ad
ci: run CRT on ubuntu22 and clean potential source tree.
dougch Nov 8, 2024
8f41046
Merge branch 'main' into crt
dougch Nov 8, 2024
ff286f3
Revert image bump
dougch Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions codebuild/bin/build_aws_crt_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ source codebuild/bin/s2n_setup_env.sh
BUILD_DIR=$1
INSTALL_DIR=$2

# Make sure there isn't another source tree hanging around.
rm -rf /opt/s2n-tls || true
Comment on lines +33 to +34
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.

mkdir -p "$BUILD_DIR/s2n"
# In case $BUILD_DIR is a subdirectory of current directory
for file in *;do test "$file" != "$BUILD_DIR" && cp -r "$file" "$BUILD_DIR/s2n";done
Expand Down
2 changes: 1 addition & 1 deletion codebuild/spec/buildspec_generalbatch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ batch:
- buildspec: codebuild/spec/buildspec_ubuntu.yml
env:
compute-type: BUILD_GENERAL1_LARGE
image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu18codebuild
image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu22codebuild
dougch marked this conversation as resolved.
Show resolved Hide resolved
privileged-mode: true
variables:
GCC_VERSION: '6'
Expand Down
Loading