From e7da4c56b18e1cd001b0ef9888cc43e7e32c327c Mon Sep 17 00:00:00 2001
From: Dengke Tang <dengket@amazon.com>
Date: Fri, 24 Feb 2023 15:39:09 -0800
Subject: [PATCH] update helper scripts and more

---
 .github/workflows/ci.yml            |  6 +++---
 dev-scripts/prepare_pecl_release.py |  7 +------
 dev-scripts/run_tests.bat           | 20 ++++++++++++++------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e67912e..0ed8153 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -167,7 +167,7 @@ jobs:
           ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream
 
   pecl-package-test:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -179,9 +179,9 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Run tests
+    - name: Test PECL package build
       run: |
-        ./dev-scripts/prepare_release.sh --name aws-crt --user aws-crt --email aws-sdk-common-runtime@amazon.com --version 1.0.0 --notes NOTES
+        python3 dev-scripts/prepare_pecl_release.py --name aws-crt --user aws-crt --version 1.0.0
         tar -zxf *.tgz
         cd awscrt-1.0.0
         phpize
diff --git a/dev-scripts/prepare_pecl_release.py b/dev-scripts/prepare_pecl_release.py
index a510b59..1bbfc5e 100644
--- a/dev-scripts/prepare_pecl_release.py
+++ b/dev-scripts/prepare_pecl_release.py
@@ -1,7 +1,6 @@
 import argparse
 import os
 import subprocess
-import xml.dom.minidom
 
 
 parser = argparse.ArgumentParser(description='PECL Package generator')
@@ -38,11 +37,7 @@ subprocess.run(['python3', f'{TOOLS_DIR}/prepare_pecl_package_xml.py', '--name',
 try:
     with open('package.xml', 'r') as f:
         package_xml = f.read()
-    doc = xml.dom.minidom.parse('package.xml')
-    doc.encoding = 'UTF-8'
-    xml_str = doc.toprettyxml(indent=' ', newl='')
-    with open('package.xml', 'w') as f:
-        f.write(xml_str)
+    subprocess.run(['tidy', '-xml', '-m', '-i', 'package.xml'], check=True)
     subprocess.run(['pear', 'package-validate'], check=True)
     subprocess.run(['pear', 'package'], check=True)
 except subprocess.CalledProcessError as e:
diff --git a/dev-scripts/run_tests.bat b/dev-scripts/run_tests.bat
index 2b94014..28e152f 100644
--- a/dev-scripts/run_tests.bat
+++ b/dev-scripts/run_tests.bat
@@ -8,16 +8,24 @@ if not "%~1"=="" (
   set "PHP_BINARY=%~1"
 )
 
-REM Check if composer_dir was found
-if "%composer_dir%"=="" (
-  echo No composer found.
-  exit /b 1
-)
-
 set "script_dir=%~dp0"
 set "work_dir=%script_dir%/.."
 cd %work_dir%
 
+set vendor_path=vendor
+
+if not exist "%vendor_path%" (
+  REM Run command to get composer_dir
+  set "composer_dir="
+  for /f "usebackq delims=" %%i in (`where composer.phar`) do set "composer_dir=%%i"
+
+  REM Check if composer_dir was found
+  if "%composer_dir%"=="" (
+    echo No composer found.
+    exit /b 1
+  )
+)
+
 call %PHP_BINARY% -c php-win.ini %composer_dir% update
 call %PHP_BINARY% -c php-win.ini vendor/bin/phpunit tests --debug