get the right php

This commit is contained in:
Dengke Tang
2023-02-23 16:47:03 -08:00
parent 72c24d9ded
commit 7c12d40536
2 changed files with 10 additions and 3 deletions
+1 -1
View File
@@ -121,7 +121,7 @@ jobs:
.\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared .\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared
nmake nmake
nmake generate-php-ini nmake generate-php-ini
.\dev-scripts\run_tests .\dev-scripts\run_tests ${{steps.setup-php-sdk.outputs.prefix}}\php
# windows-vc14: # windows-vc14:
# runs-on: windows-latest # runs-on: windows-latest
+9 -2
View File
@@ -5,6 +5,13 @@ REM Run command to get composer_dir
set "composer_dir=" set "composer_dir="
for /f "usebackq delims=" %%i in (`where composer.phar`) do set "composer_dir=%%i" for /f "usebackq delims=" %%i in (`where composer.phar`) do set "composer_dir=%%i"
set "PHP_BINARY=php"
if not "%~1"=="" (
set "PHP_BINARY=%~1"
)
REM Check if composer_dir was found REM Check if composer_dir was found
if "%composer_dir%"=="" ( if "%composer_dir%"=="" (
echo No composer found. echo No composer found.
@@ -16,13 +23,13 @@ if "%composer_dir%"=="" (
echo %work_dir% echo %work_dir%
ls x64\ ls x64\
php -c php-win.ini %composer_dir% update %PHP_BINARY% -c php-win.ini %composer_dir% update
if %errorlevel% neq 0 ( if %errorlevel% neq 0 (
echo An error occurred while using composer to get dependence echo An error occurred while using composer to get dependence
exit /b %errorlevel% exit /b %errorlevel%
) )
php -c php-win.ini vendor/bin/phpunit tests --debug %PHP_BINARY% -c php-win.ini vendor/bin/phpunit tests --debug
if %errorlevel% neq 0 ( if %errorlevel% neq 0 (
echo An error occurred while running unittests echo An error occurred while running unittests
exit /b %errorlevel% exit /b %errorlevel%