]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 11 Oct 2019 15:44:50 +0000 (17:44 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 11 Oct 2019 15:44:59 +0000 (17:44 +0200)
1  2 
.gitignore
azure-pipelines.yml
azure/job.yml

diff --cc .gitignore
Simple merge
index 586edf72e87936d4627659ee9b507cac630d9f88,83925636f9314c91846de0b2869c1e188dce1242..7b36b7da4c3e2210cf46582530b0a572d7dbf097
@@@ -79,6 -79,10 +79,10 @@@ jobs
        parameters:
          configurationName: COMMUNITY
          configurationParameters: >-
 -            --enable-debug --enable-maintainer-zts
 +            --enable-debug --enable-zts
              CFLAGS='-fsanitize=undefined,address -fno-sanitize-recover -DZEND_TRACK_ARENA_ALLOC'
              LDFLAGS='-fsanitize=undefined,address'
 -        configurationParameters: '--enable-debug --disable-maintainer-zts'
+     - template: azure/coverage_job.yml
+       parameters:
+         configurationName: COVERAGE_DEBUG_ZTS
++        configurationParameters: '--enable-debug --disable-zts'
diff --cc azure/job.yml
Simple merge