diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-06-13 11:28:46 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-06-14 12:55:00 +0200 |
| commit | f16b012116d6c015632741a3caada5b30ef8a699 (patch) | |
| tree | a65b4ade744e6675ffc1509c8d343778f6a1d8b6 /azure/macos | |
| parent | 8b6b4870e7819c1e03ed128a3a355ab48d5d48a2 (diff) | |
| download | php-git-f16b012116d6c015632741a3caada5b30ef8a699.tar.gz | |
fix mac tests on azure
Diffstat (limited to 'azure/macos')
| -rw-r--r-- | azure/macos/brew.yml | 19 | ||||
| -rw-r--r-- | azure/macos/job.yml | 11 | ||||
| -rw-r--r-- | azure/macos/test.yml | 3 |
3 files changed, 16 insertions, 17 deletions
diff --git a/azure/macos/brew.yml b/azure/macos/brew.yml index f4a23ef3de..5c0592086b 100644 --- a/azure/macos/brew.yml +++ b/azure/macos/brew.yml @@ -4,13 +4,17 @@ parameters: steps: - script: | /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" - # see https://formulae.brew.sh/ for package names - brew install autoconf \ + displayName: 'Install Homebrew' + - script: | + brew install pkg-config \ + autoconf \ automake \ libtool \ bison \ - re2c \ - pkg-config \ + re2c + displayName: 'Install Build Tools' + - script: | + brew install openssl@1.1 \ krb5 \ bzip2 \ enchant \ @@ -20,7 +24,6 @@ steps: freetype \ intltool \ icu4c \ - readline \ libiconv \ zlib \ t1lib \ @@ -28,8 +31,8 @@ steps: libzip \ gmp \ tidyp \ - libxml2\ - openssl@1.1 \ + libxml2 \ + libxslt \ postgresql brew link icu4c gettext --force - displayName: 'brew' + displayName: 'Install Build Dependencies' diff --git a/azure/macos/job.yml b/azure/macos/job.yml index cbfc54ef92..56f34fbb41 100644 --- a/azure/macos/job.yml +++ b/azure/macos/job.yml @@ -14,6 +14,8 @@ jobs: export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/krb5/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig" + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxslt/lib/pkgconfig" + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig" ./buildconf --force ./configure ${{ parameters.configurationParameters }} \ --prefix=/usr/local \ @@ -32,7 +34,6 @@ jobs: --enable-exif \ --with-zip \ --with-zlib \ - --with-zlib-dir=/usr \ --enable-soap \ --enable-xmlreader \ --with-xsl \ @@ -46,7 +47,7 @@ jobs: --with-readline=/usr/local/opt/readline \ --enable-mbstring \ --with-curl \ - --with-gettext==/usr/local/opt/gettext \ + --with-gettext=/usr/local/opt/gettext \ --enable-sockets \ --with-bz2=/usr/local/opt/bzip2 \ --with-openssl \ @@ -79,9 +80,3 @@ jobs: configurationName: ${{ parameters.configurationName }} runTestsName: 'OpCache' runTestsParameters: -d zend_extension=opcache.so -d opcache.enable_cli=1 - - ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/PHP-7.4') }}: - - template: test.yml - parameters: - configurationName: ${{ parameters.configurationName }} - runTestsName: 'JIT' - runTestsParameters: -d zend_extension=opcache.so -d opcache.enable_cli=1 -d opcache.jit_buffer_size=16M diff --git a/azure/macos/test.yml b/azure/macos/test.yml index edaa68fa6d..4eacf86aad 100644 --- a/azure/macos/test.yml +++ b/azure/macos/test.yml @@ -7,6 +7,7 @@ steps: export TEST_PHP_JUNIT=junit.xml export REPORT_EXIT_STATUS=no export SKIP_IO_CAPTURE_TESTS=1 + export CI_NO_IPV6=1 rm -rf junit.xml | true /usr/local/bin/php run-tests.php -P -q \ -j$(sysctl -n hw.ncpu) \ @@ -22,6 +23,6 @@ steps: testResultsFormat: 'JUnit' testResultsFiles: junit.xml testRunTitle: '${{ parameters.configurationName }} ${{ parameters.runTestsName }}' - failTaskOnFailedTests: false + failTaskOnFailedTests: true displayName: 'Export ${{ parameters.configurationName }} ${{ parameters.runTestsName }} Results' condition: or(succeeded(), failed()) |