diff --git a/.gitmodules b/.gitmodules index 071ffa1e5..f672310ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "aws-c-http"] path = aws-c-http url = git://github.com/awslabs/aws-c-http +[submodule "aws-c-compression"] + path = aws-c-compression + url = git://github.com/awslabs/aws-c-compression diff --git a/aws-c-cal b/aws-c-cal index a31832ec0..6bb65a2b3 160000 --- a/aws-c-cal +++ b/aws-c-cal @@ -1 +1 @@ -Subproject commit a31832ec03d34da36c1e4e0d30edf476051cdbdf +Subproject commit 6bb65a2b37100bcf184e6a0392db1bde63134149 diff --git a/aws-c-common b/aws-c-common index 667ebedc0..76e2a61ec 160000 --- a/aws-c-common +++ b/aws-c-common @@ -1 +1 @@ -Subproject commit 667ebedc035eaba73e4913cf33536e0080d99574 +Subproject commit 76e2a61ec69693337184bd382ab264a9e4ecc97f diff --git a/aws-c-compression b/aws-c-compression new file mode 160000 index 000000000..9cefc63b8 --- /dev/null +++ b/aws-c-compression @@ -0,0 +1 @@ +Subproject commit 9cefc63b87a2a88c94b9abc1a4a952ee14935583 diff --git a/aws-c-http b/aws-c-http index 1b86b6c12..ba7ef7d82 160000 --- a/aws-c-http +++ b/aws-c-http @@ -1 +1 @@ -Subproject commit 1b86b6c1263398b424d6dd4a94397c30c333e8c7 +Subproject commit ba7ef7d8239723c1fa66bc6fc06d7a90fecd0ac2 diff --git a/aws-c-io b/aws-c-io index 077c45900..815c4f678 160000 --- a/aws-c-io +++ b/aws-c-io @@ -1 +1 @@ -Subproject commit 077c45900fb1a401509b271a4e11e814c59e749d +Subproject commit 815c4f67842592a4598f43aa1d40ed428e482ce3 diff --git a/aws-c-mqtt b/aws-c-mqtt index 686dcc35a..19ec55815 160000 --- a/aws-c-mqtt +++ b/aws-c-mqtt @@ -1 +1 @@ -Subproject commit 686dcc35a67b258efad71ea6fdb6b3c1ea014c4a +Subproject commit 19ec55815a45c7b5c5a8961444ea03d7bc043c96 diff --git a/codebuild/common-linux.sh b/codebuild/common-linux.sh index 69671a479..a2c080853 100755 --- a/codebuild/common-linux.sh +++ b/codebuild/common-linux.sh @@ -7,7 +7,7 @@ CMAKE_ARGS="$@" git submodule update --init --recursive export AWS_C_INSTALL=`pwd`/build/deps/install -python3 setup.py build +python3 setup.py install # Tests cannot be run on ancient linux, which is detectable because it does not have lsb_release on it LSB_BINARY=`which lsb_release` @@ -21,7 +21,6 @@ cert=$(aws secretsmanager get-secret-value --secret-id "unit-test/certificate" - key=$(aws secretsmanager get-secret-value --secret-id "unit-test/privatekey" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$key" > /tmp/privatekey.pem ENDPOINT=$(aws secretsmanager get-secret-value --secret-id "unit-test/endpoint" --query "SecretString" | cut -f2 -d":" | sed -e 's/[\\\"\}]//g') -python3 setup.py build install python3 elasticurl.py -v ERROR -P -H "content-type: application/json" -i -d "{'test':'testval'}" http://httpbin.org/post python3 elasticurl.py -v ERROR -i https://example.com python3 mqtt_test.py --endpoint $ENDPOINT --port 8883 --cert /tmp/certificate.pem --key /tmp/privatekey.pem --root-ca /tmp/AmazonRootCA1.pem diff --git a/setup.py b/setup.py index cc72cde5e..dc90c6913 100644 --- a/setup.py +++ b/setup.py @@ -139,6 +139,7 @@ def build_dependency(lib_name): build_dependency('aws-c-io') build_dependency('aws-c-mqtt') build_dependency('aws-c-cal') +build_dependency('aws-c-compression') build_dependency('aws-c-http') os.chdir(current_dir) @@ -146,7 +147,7 @@ def build_dependency(lib_name): from distutils.ccompiler import get_default_compiler compiler_type = get_default_compiler() -aws_c_libs = ['aws-c-mqtt', 'aws-c-io', 'aws-c-common', 'aws-c-cal', 'aws-c-http'] +aws_c_libs = ['aws-c-mqtt', 'aws-c-http', 'aws-c-io', 'aws-c-compression', 'aws-c-cal', 'aws-c-common'] def get_from_env(key): try: