From 0e06b4a0564e03412ba6cc4abab886817b8dc6b5 Mon Sep 17 00:00:00 2001 From: Cameron Bytheway Date: Mon, 9 Dec 2024 12:32:39 -0700 Subject: [PATCH] build(deps): bump AWS-LC to v1.40.0 --- codebuild/bin/build_aws_crt_cpp.sh | 6 +++--- codebuild/bin/install_awslc.sh | 2 +- codebuild/spec/buildspec_generalbatch.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/codebuild/bin/build_aws_crt_cpp.sh b/codebuild/bin/build_aws_crt_cpp.sh index 5947a10300a..7d4e6d7111c 100755 --- a/codebuild/bin/build_aws_crt_cpp.sh +++ b/codebuild/bin/build_aws_crt_cpp.sh @@ -41,9 +41,9 @@ git clone --depth 1 --shallow-submodules --recurse-submodules https://github.com rm -r aws-crt-cpp/crt/s2n mv s2n aws-crt-cpp/crt/ -cmake ./aws-crt-cpp -Bbuild -GNinja -DBUILD_DEPS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -ninja -C ./build install -CTEST_OUTPUT_ON_FAILURE=1 CTEST_PARALLEL_LEVEL=$(nproc) ninja -C ./build test +cmake ./aws-crt-cpp -Bbuild -DBUILD_DEPS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" +make -C ./build install +CTEST_OUTPUT_ON_FAILURE=1 CTEST_PARALLEL_LEVEL=$(nproc) make -C ./build test popd diff --git a/codebuild/bin/install_awslc.sh b/codebuild/bin/install_awslc.sh index c4cd3fee4d1..87a92a41a96 100755 --- a/codebuild/bin/install_awslc.sh +++ b/codebuild/bin/install_awslc.sh @@ -39,7 +39,7 @@ fi if [ "$IS_FIPS" == "1" ]; then AWSLC_VERSION=AWS-LC-FIPS-1.0.3 else - AWSLC_VERSION=v1.36.0 + AWSLC_VERSION=v1.40.0 fi mkdir -p "$BUILD_DIR"||true cd "$BUILD_DIR" diff --git a/codebuild/spec/buildspec_generalbatch.yml b/codebuild/spec/buildspec_generalbatch.yml index dc86e81b94f..43916d7ff4d 100644 --- a/codebuild/spec/buildspec_generalbatch.yml +++ b/codebuild/spec/buildspec_generalbatch.yml @@ -180,7 +180,7 @@ batch: image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu18codebuild privileged-mode: true variables: - GCC_VERSION: '6' + GCC_VERSION: '9' TESTS: crt identifier: s2nUnitCRT - buildspec: codebuild/spec/buildspec_ubuntu.yml