From 4d5420dffcb04748c0e5febd826c3dcedb85f998 Mon Sep 17 00:00:00 2001 From: Dengke Tang Date: Thu, 23 Feb 2023 22:30:30 -0800 Subject: [PATCH] done --- .github/workflows/ci.yml | 3 ++- Makefile.frag.w32 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68222b2..e67912e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,7 @@ jobs: runs-on: windows-2019 defaults: run: - shell: cmd # TODO: does this matter? + shell: cmd # use CMD instead of powershell to catch error from bat script strategy: matrix: arch: [x64] @@ -118,6 +118,7 @@ jobs: with: arch: ${{ matrix.arch }} toolset: ${{steps.setup-php-sdk.outputs.toolset}} + # CMD only execute one commend per run - run: phpize - run: .\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared --enable-cli --enable-openssl - run: nmake diff --git a/Makefile.frag.w32 b/Makefile.frag.w32 index 3090286..441abcd 100644 --- a/Makefile.frag.w32 +++ b/Makefile.frag.w32 @@ -27,5 +27,5 @@ $(AWSCRT_DIR)\ext\api.h: $(AWSCRT_DIR)\crt\aws-crt-ffi\src\api.h # Get the dll directory to load generate-php-ini: @echo extension=$(BUILD_DIR)\php_awscrt.dll > php-win.ini - @echo extension=$(PHP_PREFIX)\php_openssl.dll >> php-win.ini + @echo extension=$(PHP_PREFIX)\ext\php_openssl.dll >> php-win.ini @echo extension=$(PHP_PREFIX)\ext\php_mbstring.dll >> php-win.ini