Merge branch 'main' into MqttJsUpgrade

CMakeLists.txt

@@ -43,11 +43,17 @@ if (BUILD_DEPS)
 
     add_subdirectory(crt/aws-c-common)
     if (UNIX AND NOT APPLE)
-        set(SEARCH_LIBCRYPTO OFF)
-        set(DISABLE_GO ON)
-        set(DISABLE_PERL ON)
-        set(BUILD_LIBSSL OFF)
-        add_subdirectory(crt/aws-lc)
+        include(AwsPrebuildDependency)
+        # s2n-tls uses libcrypto during its configuration, so we need to prebuild aws-lc.
+        prebuild_dependency(
+            DEPENDENCY_NAME AWSLC
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crt/aws-lc
+            CMAKE_ARGUMENTS
+                -DDISABLE_GO=ON
+                -DDISABLE_PERL=ON
+                -DBUILD_LIBSSL=OFF
+                -DBUILD_TESTING=OFF
+        )
         set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF)
         add_subdirectory(crt/s2n)
     endif()

builder.json

@@ -66,6 +66,14 @@
         "al2012": {
             "!packages": [],
             "!imports": [ "node-14" ]
+        },
+        "macos": {
+            "architectures": {
+                "arm64": {
+                    "_comment": "Mac OS (arm64) has only experimental support for Node v15 and earlier, so stick to Node v16, see Node v15 docs: https://github.com/nodejs/node/blob/v15.x/BUILDING.md#platform-list",
+                    "!imports": [ "node-16" ]
+                }
+            }
         }
     },
     "targets": {

continuous-delivery/pack.yml

@@ -2,7 +2,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      nodejs: 10
+      nodejs: 14
   pre_build:
     commands:
       - cd aws-crt-nodejs

continuous-delivery/publish.yml

@@ -2,7 +2,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      nodejs: 10
+      nodejs: 14
   build:
     commands:
       - cd aws-crt-nodejs

continuous-delivery/test-version-exists.yml

@@ -2,7 +2,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      nodejs: 10
+      nodejs: 14
   build:
     commands:
       - cd aws-crt-nodejs