Skip to content

Commit

Permalink
hard code the lead
Browse files Browse the repository at this point in the history
  • Loading branch information
TingDaoK committed Oct 16, 2023
1 parent 5545a4f commit 48c488e
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 11 additions & 5 deletions dev-scripts/package.xml-template_pre
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@
<channel>pecl.php.net</channel>
<summary>AWS Common Runtime PHP bindings</summary>
<description>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.</description>
<lead>
<name>{{{NAME}}}</name>
<user>{{{USER}}}</user>
<email>{{{EMAIL}}}</email>
<lead>
<name>Dengke Tang</name>
<user>dengket</user>
<email>tingdaoform@gmail.com</email>
<active>yes</active>
</lead>
<lead>
<name>Dmitriy Musatkin</name>
<user>musatkd</user>
<email>musatkd@amazon.com</email>
<active>yes</active>
</lead>
</lead>
<date>{{{TODAY}}}</date>
<version>
<release>{{{VERSION}}}</release>
Expand Down
12 changes: 0 additions & 12 deletions dev-scripts/prepare_pecl_package_xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,12 @@

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

Expand Down Expand Up @@ -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)
Expand Down
12 changes: 2 additions & 10 deletions dev-scripts/prepare_pecl_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,13 @@


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(
"--notes", help="Release notes for the package", default='New release')
args = parser.parse_args()

PACKAGE = 'awscrt'
NAME = args.name
USER = args.user
EMAIL = args.email
VERSION = args.version
NOTES = args.notes

Expand Down Expand Up @@ -65,8 +57,8 @@ def run(args):


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}')

Expand Down
2 changes: 1 addition & 1 deletion ext/php_aws_crt.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 48c488e

Please sign in to comment.