diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ede1bb6..23cb682 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -181,5 +181,5 @@ jobs: - name: Test PECL package build run: | - python3 dev-scripts/prepare_pecl_release.py --name aws-crt --user aws-crt --version 1.0.0 + python3 dev-scripts/prepare_pecl_release.py --version 1.0.0 sudo pecl install awscrt-1.0.0.tgz diff --git a/dev-scripts/package.xml-template_pre b/dev-scripts/package.xml-template_pre index c5fc519..a51577e 100644 --- a/dev-scripts/package.xml-template_pre +++ b/dev-scripts/package.xml-template_pre @@ -4,10 +4,16 @@ pecl.php.net AWS Common Runtime PHP bindings AWS Common Runtime provides a set of low level tools as network protocols and authentication used by the AWSSDK for PHP to provide high level API to access AWS services. + + Dengke Tang + dengket + tingdaoform@gmail.com + yes + - {{{NAME}}} - {{{USER}}} - {{{EMAIL}}} + Dmitriy Musatkin + musatkd + musatkd@amazon.com yes {{{TODAY}}} diff --git a/dev-scripts/prepare_pecl_package_xml.py b/dev-scripts/prepare_pecl_package_xml.py index 67a7057..92db373 100644 --- a/dev-scripts/prepare_pecl_package_xml.py +++ b/dev-scripts/prepare_pecl_package_xml.py @@ -6,21 +6,12 @@ from datetime import datetime parser = argparse.ArgumentParser( description="Generate package.xml file for a release bundle.") -parser.add_argument("--name", help="Name of the package", required=True) -parser.add_argument( - "--user", help="Username of the package maintainer", required=True) -parser.add_argument( - "--email", help="Email address of the package maintainer", default='aws-sdk-common-runtime@amazon.com') parser.add_argument( "--version", help="Version number of the package", required=True) parser.add_argument( "--notes", help="Release notes for the package", default='New release') args = parser.parse_args() - -name = args.name -user = args.user -email = args.email version = args.version notes = args.notes @@ -105,9 +96,6 @@ def process_dir(dir_name, f): with open(os.path.join(tools_dir, "package.xml-template_pre"), 'r') as f: template_pre = f.read() -template_pre = re.sub(r"{{{NAME}}}", name, template_pre) -template_pre = re.sub(r"{{{USER}}}", user, template_pre) -template_pre = re.sub(r"{{{EMAIL}}}", email, template_pre) template_pre = re.sub(r"{{{TODAY}}}", today, template_pre) template_pre = re.sub(r"{{{VERSION}}}", version, template_pre) template_pre = re.sub(r"{{{NOTES}}}", notes, template_pre) diff --git a/dev-scripts/prepare_pecl_release.py b/dev-scripts/prepare_pecl_release.py index 3da45d9..98d5698 100644 --- a/dev-scripts/prepare_pecl_release.py +++ b/dev-scripts/prepare_pecl_release.py @@ -11,11 +11,6 @@ git_tag = subprocess.run( parser = argparse.ArgumentParser(description='PECL Package generator') -parser.add_argument("--name", help="Name of the package", required=True) -parser.add_argument( - "--user", help="Username of the package maintainer", required=True) -parser.add_argument( - "--email", help="Email address of the package maintainer", default='aws-sdk-common-runtime@amazon.com') parser.add_argument( "--version", help="Version number of the package", default=git_tag) parser.add_argument( @@ -23,9 +18,6 @@ parser.add_argument( args = parser.parse_args() PACKAGE = 'awscrt' -NAME = args.name -USER = args.user -EMAIL = args.email VERSION = args.version NOTES = args.notes @@ -65,8 +57,8 @@ with open(file_with_version, "w") as c_file: try: - run(['python3', f'{TOOLS_DIR}/prepare_pecl_package_xml.py', '--name', NAME, '--user', USER, - '--email', EMAIL, '--version', VERSION, '--notes', NOTES]) + run(['python3', f'{TOOLS_DIR}/prepare_pecl_package_xml.py', + '--version', VERSION, '--notes', NOTES]) except subprocess.CalledProcessError as e: sys.exit(f'ERROR PROCESSING review package.xml: {e}') diff --git a/ext/php_aws_crt.h b/ext/php_aws_crt.h index d2522d7..393e4b0 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.2.2" +#define PHP_AWSCRT_VERSION "1.2.3" ZEND_BEGIN_MODULE_GLOBALS(awscrt) long log_level;