mirrors/awslabs_aws-crt-php
1
0
Fork 0
mirror of https://github.com/awslabs/aws-crt-php.git synced 2026-08-18 01:57:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows ci fix (#86)

Browse Source
This commit is contained in:
Dengke Tang
2023-02-23 22:46:12 -08:00
committed by GitHub
parent 8c66121b2f
commit e361f03140
5 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+21 -19
View File
@@ -82,21 +82,24 @@ jobs:
make make
./dev-scripts/run_tests ./dev-scripts/run_tests
# linux-arm: # linux-arm:
# name: ARM (${{ matrix.arch }}) # name: ARM (${{ matrix.arch }})
# runs-on: ubuntu-latest # runs-on: ubuntu-latest
# strategy: # strategy:
# matrix: # matrix:
# arch: [armv6, armv7, arm64] # arch: [armv6, armv7, arm64]
# steps: # steps:
# - name: Build ${{ env.PACKAGE_NAME }} # - name: Build ${{ env.PACKAGE_NAME }}
# run: | # run: |
# python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" # 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 # chmod a+x builder
# ./builder build -p ${{ env.PACKAGE_NAME }} --target=linux-${{ matrix.arch }} --spec=downstream # ./builder build -p ${{ env.PACKAGE_NAME }} --target=linux-${{ matrix.arch }} --spec=downstream
windows-vc16: windows-vc16:
runs-on: windows-2019 runs-on: windows-2019
defaults:
run:
shell: cmd # use CMD instead of powershell to catch error from bat script
strategy: strategy:
matrix: matrix:
arch: [x64] arch: [x64]
@@ -115,13 +118,12 @@ jobs:
with: with:
arch: ${{ matrix.arch }} arch: ${{ matrix.arch }}
toolset: ${{steps.setup-php-sdk.outputs.toolset}} toolset: ${{steps.setup-php-sdk.outputs.toolset}}
- name: Build ${{ env.PACKAGE_NAME }} + consumers # CMD only execute one commend per run
run: | - run: phpize
phpize - run: .\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared --enable-cli --enable-openssl
.\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared --enable-cli --enable-openssl - run: nmake
nmake - run: nmake generate-php-ini
nmake generate-php-ini - run: .\dev-scripts\run_tests ${{steps.setup-php-sdk.outputs.prefix}}\php
.\dev-scripts\run_tests ${{steps.setup-php-sdk.outputs.prefix}}\php
# windows-vc14: # windows-vc14:
# runs-on: windows-latest # runs-on: windows-latest
Makefile.frag.w32
+2
View File
@@ -27,3 +27,5 @@ $(AWSCRT_DIR)\ext\api.h: $(AWSCRT_DIR)\crt\aws-crt-ffi\src\api.h
# Get the dll directory to load # Get the dll directory to load
generate-php-ini: generate-php-ini:
@echo extension=$(BUILD_DIR)\php_awscrt.dll > php-win.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
composer.json
+1 -2
View File
@@ -15,8 +15,7 @@
}, },
"minimum-stability": "alpha", "minimum-stability": "alpha",
"require": { "require": {
"php": ">=5.5", "php": ">=5.5"
"ext-awscrt": "*"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit":"^5.6.3" "phpunit/phpunit":"^5.6.3"
dev-scripts/run_tests.bat
-1
View File
@@ -11,7 +11,6 @@ if not "%~1"=="" (
set "PHP_BINARY=%~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.
php-win.ini
+1 -1
View File
@@ -1,3 +1,3 @@
extension_dir="ext" extension=php_awscrt.dll
extension=php_openssl.dll extension=php_openssl.dll
extension=php_mbstring.dll extension=php_mbstring.dll