From: Joe Watkins <krakjoe@php.net>
Date: Tue, 11 Jun 2019 08:25:39 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db86375c3ebca0f8c4a8398851223b348958ab39;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  i386 build
---

db86375c3ebca0f8c4a8398851223b348958ab39
diff --cc azure-pipelines.yml
index 69fcde6617,cff40c579c..d381dd6850
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@@ -6,22 -6,38 +6,38 @@@ trigger
        - master
  
  jobs:
-   - template: azure/job.yml
-     parameters:
-       configurationName: RELEASE_NTS
-       configurationParameters: '--disable-debug --disable-zts'
+ #  - template: azure/job.yml
+ #    parameters:
+ #      configurationName: RELEASE_NTS
 -#      configurationParameters: '--disable-debug --disable-maintainer-zts'
++#      configurationParameters: '--disable-debug --disable-zts'
    - template: azure/job.yml
      parameters:
        configurationName: DEBUG_NTS
 -      configurationParameters: '--enable-debug --disable-maintainer-zts'
 +      configurationParameters: '--enable-debug --disable-zts'
-   - template: azure/job.yml
-     parameters:
-       configurationName: RELEASE_ZTS
-       configurationParameters: '--disable-debug --enable-zts'
+ #  - template: azure/job.yml
+ #    parameters:
+ #      configurationName: RELEASE_ZTS
 -#      configurationParameters: '--disable-debug --enable-maintainer-zts'
++#      configurationParameters: '--disable-debug --enable-zts'
    - template: azure/job.yml
      parameters:
        configurationName: DEBUG_ZTS
 -      configurationParameters: '--enable-debug --enable-maintainer-zts'
 +      configurationParameters: '--enable-debug --enable-zts'
+ #  - template: azure/i386/job.yml
+ #    parameters:
+ #      configurationName: I386_RELEASE_NTS
 -#      configurationParameters: '--disable-debug --disable-maintainer-zts'
++#      configurationParameters: '--disable-debug --disable-zts'
+   - template: azure/i386/job.yml
+     parameters:
+       configurationName: I386_DEBUG_NTS
 -      configurationParameters: '--enable-debug --disable-maintainer-zts'
++      configurationParameters: '--enable-debug --disable-zts'
+ #  - template: azure/i386/job.yml
+ #    parameters:
+ #      configurationName: I386_RELEASE_ZTS
 -#      configurationParameters: '--disable-debug --enable-maintainer-zts'
++#      configurationParameters: '--disable-debug --enable-zts'
+   - template: azure/i386/job.yml
+     parameters:
+       configurationName: I386_DEBUG_ZTS
 -      configurationParameters: '--enable-debug --enable-maintainer-zts'
++      configurationParameters: '--enable-debug --enable-zts'
    - template: azure/macos/job.yml
      parameters:
        configurationName: MACOS_DEBUG_NTS