From d49eaad553ef0a56f9b96e9b3b450cd4ae9b0ca8 Mon Sep 17 00:00:00 2001
From: Dengke Tang <dengket@amazon.com>
Date: Tue, 8 Nov 2022 09:31:23 -0800
Subject: [PATCH] what's the version

---
 .github/workflows/ci.yml | 46 ++++++++++++++++++++--------------------
 Makefile.frag.w32        |  2 ++
 run_tests                |  2 ++
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 93bc8dc..38f7eb2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -120,26 +120,26 @@ jobs:
           .\php-sdk\phpsdk-vs16-x64.bat -t .\aws-crt-php\win_build.bat --task-args %CD%\aws-crt-php
 
 
-  # macos:
-  #   runs-on: macos-${{ matrix.version }}
-  #   strategy:
-  #     matrix:
-  #       version: [10.15]
-  #   steps:
-  #     # Force PHP to 8.0
-  #     # Doing this because tests fail in PHP 8.1 (default on macos Github Runner as of Dec 2021)
-  #     # due to the old version of PHPUnit we're using.
-  #     # We're using an old PHPUnit because it's compatible our min supported PHP 5.5.
-  #     # Quick fix is to force PHP version back to 8.0, which can still run our tests without error.
-  #     # A real solution is to get our tests working on all PHP versions
-  #     # (maybe don't use PHPUnit, maybe raise our min supported PHP version so we can upgrade,
-  #     # or maybe use PHPUnit-Polyfills so we can use a modern PHPUnit with old PHP)
-  #     - name: Setup PHP 8.0
-  #       uses: shivammathur/setup-php@v2
-  #       with:
-  #         php-version: '8.0'
-  #     - name: Build PHP 8 extension and test
-  #       run: |
-  #         python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
-  #         chmod a+x builder
-  #         ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream
+  macos:
+    runs-on: macos-${{ matrix.version }}
+    strategy:
+      matrix:
+        version: [10.15]
+    steps:
+      # Force PHP to 8.0
+      # Doing this because tests fail in PHP 8.1 (default on macos Github Runner as of Dec 2021)
+      # due to the old version of PHPUnit we're using.
+      # We're using an old PHPUnit because it's compatible our min supported PHP 5.5.
+      # Quick fix is to force PHP version back to 8.0, which can still run our tests without error.
+      # A real solution is to get our tests working on all PHP versions
+      # (maybe don't use PHPUnit, maybe raise our min supported PHP version so we can upgrade,
+      # or maybe use PHPUnit-Polyfills so we can use a modern PHPUnit with old PHP)
+      - name: Setup PHP 8.0
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+      - name: Build PHP 8 extension and test
+        run: |
+          python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
+          chmod a+x builder
+          ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream
diff --git a/Makefile.frag.w32 b/Makefile.frag.w32
index 8372929..90b41ae 100644
--- a/Makefile.frag.w32
+++ b/Makefile.frag.w32
@@ -33,5 +33,7 @@ $(AWSCRT_DIR)\ext\api.h : $(AWSCRT_DIR)\src\api.h
 test-awscrt: install $(AWSCRT_DIR)\src\api.h $(BUILD_DIR)\php_awscrt.dll
 	curl -o composer-setup.php https://getcomposer.org/installer
     php .\composer-setup.php
+	php --version
+	$(PHP_BINARY) --version
 	$(PHP_BINARY) -c $(AWSCRT_DIR)\php-win.ini .\composer.phar --working-dir=$(AWSCRT_DIR) update
 	$(PHP_BINARY) -c $(AWSCRT_DIR)\php-win.ini .\composer.phar --working-dir=$(AWSCRT_DIR) run test-win
diff --git a/run_tests b/run_tests
index 18b449a..5b13d76 100755
--- a/run_tests
+++ b/run_tests
@@ -15,4 +15,6 @@ if [ ! -d vendor ]; then
     composer update
 fi
 
+$PHP_BINARY --version
+
 $launcher $PHP_BINARY -c php.ini vendor/bin/phpunit tests --debug