diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9fbeb6f..e67912e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,21 +82,24 @@ jobs: make ./dev-scripts/run_tests - # linux-arm: - # name: ARM (${{ matrix.arch }}) - # runs-on: ubuntu-latest - # strategy: - # matrix: - # arch: [armv6, armv7, arm64] - # steps: - # - name: Build ${{ env.PACKAGE_NAME }} - # 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 }} --target=linux-${{ matrix.arch }} --spec=downstream + # linux-arm: + # name: ARM (${{ matrix.arch }}) + # runs-on: ubuntu-latest + # strategy: + # matrix: + # arch: [armv6, armv7, arm64] + # steps: + # - name: Build ${{ env.PACKAGE_NAME }} + # 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 }} --target=linux-${{ matrix.arch }} --spec=downstream windows-vc16: runs-on: windows-2019 + defaults: + run: + shell: cmd # use CMD instead of powershell to catch error from bat script strategy: matrix: arch: [x64] @@ -115,13 +118,12 @@ jobs: with: arch: ${{ matrix.arch }} toolset: ${{steps.setup-php-sdk.outputs.toolset}} - - name: Build ${{ env.PACKAGE_NAME }} + consumers - run: | - phpize - .\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared --enable-cli --enable-openssl - nmake - nmake generate-php-ini - .\dev-scripts\run_tests ${{steps.setup-php-sdk.outputs.prefix}}\php + # 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 + - run: nmake generate-php-ini + - run: .\dev-scripts\run_tests ${{steps.setup-php-sdk.outputs.prefix}}\php # windows-vc14: # runs-on: windows-latest diff --git a/Makefile.frag.w32 b/Makefile.frag.w32 index 14cd941..441abcd 100644 --- a/Makefile.frag.w32 +++ b/Makefile.frag.w32 @@ -27,3 +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)\ext\php_openssl.dll >> php-win.ini + @echo extension=$(PHP_PREFIX)\ext\php_mbstring.dll >> php-win.ini diff --git a/composer.json b/composer.json index f7dbdd9..6f1e6ee 100644 --- a/composer.json +++ b/composer.json @@ -15,8 +15,7 @@ }, "minimum-stability": "alpha", "require": { - "php": ">=5.5", - "ext-awscrt": "*" + "php": ">=5.5" }, "require-dev": { "phpunit/phpunit":"^5.6.3" diff --git a/dev-scripts/run_tests.bat b/dev-scripts/run_tests.bat index 5611d2c..e92f1cb 100644 --- a/dev-scripts/run_tests.bat +++ b/dev-scripts/run_tests.bat @@ -11,7 +11,6 @@ if not "%~1"=="" ( set "PHP_BINARY=%~1" ) - REM Check if composer_dir was found if "%composer_dir%"=="" ( echo No composer found. diff --git a/php-win.ini b/php-win.ini index 31d5621..fb0f704 100644 --- a/php-win.ini +++ b/php-win.ini @@ -1,3 +1,3 @@ -extension_dir="ext" +extension=php_awscrt.dll extension=php_openssl.dll extension=php_mbstring.dll \ No newline at end of file