From 5545a4fa310aec39f54279fdacebcce33b3ff382 Mon Sep 17 00:00:00 2001 From: Dengke Tang <815825145@qq.com> Date: Mon, 16 Oct 2023 13:10:06 -0700 Subject: [PATCH] update submodules (#106) fixing sigv4a for MacOS 14+ --- crt/aws-crt-ffi | 2 +- dev-scripts/prepare_pecl_package_xml.py | 6 +++--- ext/php_aws_crt.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crt/aws-crt-ffi b/crt/aws-crt-ffi index a76a837..310920c 160000 --- a/crt/aws-crt-ffi +++ b/crt/aws-crt-ffi @@ -1 +1 @@ -Subproject commit a76a837a8d30d18abc9a04b78c785e93f106d9c6 +Subproject commit 310920c6ba609711a512937cb34e0416417a793d diff --git a/dev-scripts/prepare_pecl_package_xml.py b/dev-scripts/prepare_pecl_package_xml.py index 4a7f873..67a7057 100644 --- a/dev-scripts/prepare_pecl_package_xml.py +++ b/dev-scripts/prepare_pecl_package_xml.py @@ -32,15 +32,15 @@ os.chdir(work_dir) today = datetime.utcnow().strftime("%Y-%m-%d") -source_ext = "(c|cc|h|cpp|hpp|m4|w32|ini|frag|cmake|inl|in|py|gnu|yaml|def|pl|S|s|errordata|go|lds|num|asm|mod|peg|mk|rs|toml|sh)" +source_ext = "(c|cc|h|cpp|hpp|m4|w32|ini|frag|cmake|inl|in|py|gnu|yaml|def|pl|S|s|errordata|go|lds|num|asm|mod|peg|mk|rs|toml|sh|toolchain|flags)" doc_ext = "(md|json|html|dot|graphml|png|gn|sha1|css|rst)" special_docs = "(LICENSE.*|NOTICE|changelog.txt|CHANGELOG|THIRD-PARTY|README.*|readme|METADATA|CONTRIBUTORS|UPDATING|doc.config|THIRD-PARTY-LICENSES.txt)" special_tests = "(ci-test.sh|format-check.sh|run_tests.*|sanitizer-blacklist.txt|run-clang-tidy.sh|benchmark-build-run.sh|break-tests.sh|generate-coverage.sh|test.xml)" special_src = "(gen_api.php|gen_stub.php|CMakeLists.txt|post.sh|postun.sh|Makefile.*|build-buildspec.sh|build-deps.sh|objects.txt|go.*|BUILD.*|DEPS|install_and_run.sh|codemod.sh|requirements.txt|awscrt.stub.php)" -skip_files = "(package.xml.*|prepare_release.sh|codereview.settings|.*\\.o|.*\\.a|.*\\.obj|.*\\.lib|break-tests-android.sh|whitespace.txt|prepare_package_xml.sh|crypto_test_data.cc|.*\\.pdf|.*\\.svg|.*\\.docx|cbmc-proof.txt|codecov.*|litani.*|.*\\.toml|module\\.modulemap|cleanup.sh|^\..*)" +skip_files = "(package.xml.*|prepare_release.sh|codereview.settings|.*\\.o|.*\\.a|.*\\.obj|.*\\.lib|break-tests-android.sh|whitespace.txt|prepare_package_xml.sh|crypto_test_data.cc|flake.lock|flake.nix|.*\\.pdf|.*\\.svg|.*\\.docx|cbmc-proof.txt|codecov.*|litani.*|.*\\.toml|module\\.modulemap|cleanup.sh|^\..*)" -skip_directories = "(tests|test|AWSCRTAndroidTestRunner|docker-images|codebuild|fuzz|third_party|docs|generated-src|aws-lc|aws-crt-sys|ecdsa-fuzz-corpus|bin|examples|compliance|verification|dev-scripts|^\..*)" +skip_directories = "(tests|test|AWSCRTAndroidTestRunner|docker-images|codebuild|fuzz|third_party|docs|generated-src|aws-lc|aws-crt-sys|ecdsa-fuzz-corpus|bin|examples|compliance|verification|dev-scripts|nix|^\..*)" output_file_name = os.path.join(work_dir, 'package.xml') diff --git a/ext/php_aws_crt.h b/ext/php_aws_crt.h index dd42534..d2522d7 100644 --- a/ext/php_aws_crt.h +++ b/ext/php_aws_crt.h @@ -37,7 +37,7 @@ #define AWS_PHP_AT_LEAST_7 (ZEND_EXTENSION_API_NO >= AWS_PHP_EXTENSION_API_7_0) #define AWS_PHP_AT_LEAST_7_2 (ZEND_EXTENSION_API_NO >= AWS_PHP_EXTENSION_API_7_2) -#define PHP_AWSCRT_VERSION "1.1.0" +#define PHP_AWSCRT_VERSION "1.2.2" ZEND_BEGIN_MODULE_GLOBALS(awscrt) long log_level;