Skip to content

Commit

Permalink
Merge pull request #404 from viest/dev
Browse files Browse the repository at this point in the history
Test: chinese file name
  • Loading branch information
viest authored Sep 21, 2021
2 parents 9f70406 + 8852e3d commit 0e9d227
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ build_script:
#echo "@echo off" | Out-File -Encoding "ASCII" task.bat
#echo "" | Out-File -Encoding "ASCII" -Append task.bat
echo "" | Out-File -Encoding "ASCII" task.bat
echo "php -m 2>&1" | Out-File -Encoding "ASCII" -Append task.bat
echo "call git submodule update --init 2>&1" | Out-File -Encoding "ASCII" -Append task.bat
echo "call phpize 2>&1" | Out-File -Encoding "ASCII" -Append task.bat
$conf_cmd = 'call configure --with-xlswriter --with-extra-libs=c:\build-cache\zlib\lib --with-extra-includes=c:\build-cache\zlib\include --enable-debug-pack 2>&1'
Expand Down Expand Up @@ -258,7 +259,7 @@ test_script:
echo "set REPORT_EXIT_STATUS=1" | Out-File -Encoding "ASCII" -Append task.bat
$cmd = 'call configure --with-xlswriter --with-extra-libs=c:\build-cache\zlib\lib --with-extra-includes=c:\build-cache\zlib\include --with-prefix=c:\build-cache\' + $dname + ' 2>&1'
echo $cmd | Out-File -Encoding "ASCII" -Append task.bat
echo 'nmake /nologo test TESTS="-q --show-diff --set-timeout 120" 2>&1' | Out-File -Encoding "ASCII" -Append task.bat
echo 'nmake /nologo test TESTS="-q --show-all --set-timeout 120" 2>&1' | Out-File -Encoding "ASCII" -Append task.bat
echo "exit %errorlevel%" | Out-File -Encoding "ASCII" -Append task.bat
$here = (Get-Item -Path "." -Verbose).FullName
$runner = 'c:\build-cache\php-sdk-' + $env:BIN_SDK_VER + '\phpsdk' + '-' + $env:VC + '-' + $env:ARCH + '.bat'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:

- name: Build Extension And Execute Tests
run: |
php -m
phpize && ./configure --enable-reader
make clean && make && make test
Expand All @@ -49,4 +50,4 @@ jobs:
run: |
phpize && ./configure --enable-reader
make clean && make && make test
REPORT_EXIT_STATUS=1 php -n run-tests.php -m -n -d extension_dir=./modules/ -d extension=xlswriter.so -P --show-diff --set-timeout 120
REPORT_EXIT_STATUS=1 php -n run-tests.php -m -n -d extension_dir=./modules/ -d extension=xlswriter.so -P --show-all --set-timeout 120
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ notifications:
email: [email protected]

before_script:
- php -m
- git submodule update --init
- sudo apt-get install zlib1g-dev -y
- phpize && ./configure --enable-reader && make clean && make
Expand All @@ -35,7 +36,6 @@ branches:
only:
- master
- dev
- bundle

script:
- ./travis/run-test.sh
Expand Down

0 comments on commit 0e9d227

Please sign in to comment.