From 0a324362dae7e2a24becfce7cd1ac874e67bade2 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 11:52:53 -0700 Subject: [PATCH 01/19] prebuild s2n --- CMakeLists.txt | 12 +++++++++--- crt/aws-c-auth | 2 +- crt/aws-c-common | 2 +- crt/aws-c-http | 2 +- crt/aws-c-io | 2 +- crt/aws-c-mqtt | 2 +- crt/aws-c-s3 | 2 +- crt/aws-lc | 2 +- crt/s2n | 2 +- 9 files changed, 17 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 048f1eec9..8863ccf56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,8 +83,8 @@ if(BUILD_DEPS) add_subdirectory(crt/aws-c-common) if(UNIX AND NOT APPLE AND NOT BYO_CRYPTO) + include(AwsPrebuildDependency) if(NOT USE_OPENSSL) - include(AwsPrebuildDependency) set(AWSLC_CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") @@ -116,8 +116,14 @@ if(BUILD_DEPS) ) endif() - set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF CACHE BOOL "Disable warnings-as-errors when building S2N") - add_subdirectory(crt/s2n) + # prebuild s2n-tls. + aws_prebuild_dependency( + DEPENDENCY_NAME S2N + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/s2n + CMAKE_ARGUMENTS + -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF + ) endif() add_subdirectory(crt/aws-c-sdkutils) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 877c029fc..48d647bf4 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 877c029fc4e93d205f9c6855188c3c51f6b497b4 +Subproject commit 48d647bf43f8872e4dc5ec6343b0c5974195fbdd diff --git a/crt/aws-c-common b/crt/aws-c-common index 672cc0032..b9959f592 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 672cc0032eb28d69fbdd22c9463253c89d7a6f30 +Subproject commit b9959f5922a4b969beab8f0b99aa0b34bc9ee55c diff --git a/crt/aws-c-http b/crt/aws-c-http index 4e74ab1e3..6068653e1 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit 4e74ab1e3702763e0b87bd1752f5a37c2f0400ac +Subproject commit 6068653e1d582bd8e7d1c9f81f86beaf10444e3d diff --git a/crt/aws-c-io b/crt/aws-c-io index c345d7727..dc41ddc49 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit c345d77274db83c0c2e30331814093e7c84c45e2 +Subproject commit dc41ddc498c10ebbf69aba7775afa36c8c1910bd diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt index ed7bbd68c..77d6f00e8 160000 --- a/crt/aws-c-mqtt +++ b/crt/aws-c-mqtt @@ -1 +1 @@ -Subproject commit ed7bbd68c03d7022c915a2924740ab7992ad2311 +Subproject commit 77d6f00e89b10e3263d8a17576ec8e91c45b4606 diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index 0ab4d58ef..aede1d8c2 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit 0ab4d58ef0bd97970d43828cb6b57a3de5747343 +Subproject commit aede1d8c24f9f580d5a96c089878e9b258b88d04 diff --git a/crt/aws-lc b/crt/aws-lc index 2f1879759..8b2ebfcf3 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit 2f1879759b2e0fc70592665bdf10087b64f44b7d +Subproject commit 8b2ebfcf3fc8b0656f1f4161166484a70238aeaa diff --git a/crt/s2n b/crt/s2n index 87f4a0585..ffe0bf42d 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit 87f4a0585dc3056433f193b9305f587cff239be3 +Subproject commit ffe0bf42da8f139eff8fd2237f47fbde40b478fb From 04ef01b602f5085bd1d09fb69096a4bc35f0477f Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 11:57:37 -0700 Subject: [PATCH 02/19] dir is wrong --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8863ccf56..76e68cca9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,7 +119,7 @@ if(BUILD_DEPS) # prebuild s2n-tls. aws_prebuild_dependency( DEPENDENCY_NAME S2N - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/s2n + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crt/s2n CMAKE_ARGUMENTS -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF From f5ce304f8a10a80845c92302281ea6c66abb81a7 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 12:00:18 -0700 Subject: [PATCH 03/19] update naming --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 76e68cca9..2efcee399 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,7 @@ if(BUILD_DEPS) endif() # s2n-tls uses libcrypto during its configuration, so we need to prebuild aws-lc. - prebuild_dependency( + aws_prebuild_dependency( DEPENDENCY_NAME AWSLC SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crt/aws-lc CMAKE_ARGUMENTS From 7e55c5623fbf614951dac67d3ae85f2cf68460e8 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 14:32:45 -0700 Subject: [PATCH 04/19] try to fix prebuild? --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index b9959f592..a59b766cd 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit b9959f5922a4b969beab8f0b99aa0b34bc9ee55c +Subproject commit a59b766cde6de65a46d7d442363165602d2d29c8 From 38a01a2cf818a4bce4ad371dc17fbf5fb0ad0037 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 14:40:10 -0700 Subject: [PATCH 05/19] print it out --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index a59b766cd..fc208947e 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit a59b766cde6de65a46d7d442363165602d2d29c8 +Subproject commit fc208947ea2d275a00572628eeef8e660bcee9f6 From aa03f473dffe3f8068e059b2198d5ff948a9083d Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 14:46:54 -0700 Subject: [PATCH 06/19] -B? --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index fc208947e..26986bc71 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit fc208947ea2d275a00572628eeef8e660bcee9f6 +Subproject commit 26986bc715f25a64645c242deab2c03153dc6ccf From 31f3551e121a0b85fbfab7acf04f03d0cc54e7f4 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 15:01:23 -0700 Subject: [PATCH 07/19] cmake command? --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index 26986bc71..92356cad5 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 26986bc715f25a64645c242deab2c03153dc6ccf +Subproject commit 92356cad5797126e8ab0f452d47f05367c88af49 From d8b3125e2516b7b6f711c6625c7fc020e48526fb Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 15:04:04 -0700 Subject: [PATCH 08/19] print it all --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index 92356cad5..ebcc74cde 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 92356cad5797126e8ab0f452d47f05367c88af49 +Subproject commit ebcc74cdee824de4bc620342b309b1f283724aa1 From 113bf11bfeb16ab20a6f67e4f72c7507baf7c270 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 15:11:40 -0700 Subject: [PATCH 09/19] maybe this??? --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index ebcc74cde..923592c1a 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit ebcc74cdee824de4bc620342b309b1f283724aa1 +Subproject commit 923592c1ae7cb101dba20a71cb3523bb66d6ac59 From 6525b18ab248f770a0fab18a2e2f3bed151b3933 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 15:26:32 -0700 Subject: [PATCH 10/19] don't fail fast --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f0fde7ad..4fc023abd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,7 @@ jobs: linux-compat: runs-on: ubuntu-22.04 # latest strategy: + fail-fast: false matrix: image: - manylinux2014-x64 From 14aa262ff98d4fc26efd6b81bd69e284e3019658 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 15:36:30 -0700 Subject: [PATCH 11/19] try to use it as a string --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index 923592c1a..d6a5336fd 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 923592c1ae7cb101dba20a71cb3523bb66d6ac59 +Subproject commit d6a5336fdb07f030e9d96ae34c00864e6ba39ea9 From 36c9857300fad04dd961276fc95bbbae57a35075 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 15:46:45 -0700 Subject: [PATCH 12/19] try this --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index d6a5336fd..457d5aead 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit d6a5336fdb07f030e9d96ae34c00864e6ba39ea9 +Subproject commit 457d5aeada629383edd1e3c0cd2309d09530e526 From 8f1a31ea15cb110a1ed70d227381bcf5e0fd70d0 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 15:49:14 -0700 Subject: [PATCH 13/19] again --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index 457d5aead..703c83233 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 457d5aeada629383edd1e3c0cd2309d09530e526 +Subproject commit 703c83233095e82ad518122c1737f3b53ac50ddc From ec28305f024c90a23eb3e1ecb2d8d32c32164147 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 15:53:59 -0700 Subject: [PATCH 14/19] env var? --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index 703c83233..891f8d102 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 703c83233095e82ad518122c1737f3b53ac50ddc +Subproject commit 891f8d102d89394402680620cbd6f0a880386dd4 From 4123cfe0d2b977c78315b2d96ea4422be3a38fac Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 15:56:35 -0700 Subject: [PATCH 15/19] another way to set env --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index 891f8d102..d62a7bfa9 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 891f8d102d89394402680620cbd6f0a880386dd4 +Subproject commit d62a7bfa90a2971fa1976f18d261cc3a4c320dcf From e2c9a3ba465398c368d37f7cc2383a72637d47c9 Mon Sep 17 00:00:00 2001 From: Dengke Date: Fri, 11 Oct 2024 11:14:27 -0700 Subject: [PATCH 16/19] try escape the list --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index d62a7bfa9..0fa285e4e 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit d62a7bfa90a2971fa1976f18d261cc3a4c320dcf +Subproject commit 0fa285e4e01f0ce85959e0a41e0c5bac79a37fbc From f52605304a13964510206ad3b7c407f139ed8b73 Mon Sep 17 00:00:00 2001 From: Dengke Date: Fri, 11 Oct 2024 11:26:01 -0700 Subject: [PATCH 17/19] another take to escape --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index 0fa285e4e..a62c71e60 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 0fa285e4e01f0ce85959e0a41e0c5bac79a37fbc +Subproject commit a62c71e60c8df1473966da0a9976f4276fe238f0 From cd3e754a9ab090ff89b9658e9167fabed91de694 Mon Sep 17 00:00:00 2001 From: Dengke Date: Fri, 11 Oct 2024 13:07:54 -0700 Subject: [PATCH 18/19] more --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index a62c71e60..c9e5c9a0d 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit a62c71e60c8df1473966da0a9976f4276fe238f0 +Subproject commit c9e5c9a0df2b787c2dcfbbc25de2c6db497500aa From 68dc723a81260e9a5add6903439d7926ef31b30a Mon Sep 17 00:00:00 2001 From: Dengke Date: Fri, 11 Oct 2024 15:23:57 -0700 Subject: [PATCH 19/19] latest --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index c9e5c9a0d..f8c5d8e51 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit c9e5c9a0df2b787c2dcfbbc25de2c6db497500aa +Subproject commit f8c5d8e5134fa97955351a44f16b84f96de24045