Merge branch 'PHP-7.4'

azure/coverage_job.yml

@@ -20,11 +20,7 @@ jobs:
     - script: make -j$(/usr/bin/nproc) >/dev/null
       displayName: 'Make Build'
     - template: install.yml
-    - script: |
-        mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
-        sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
-        sudo -u postgres psql -c "CREATE DATABASE test;"
-      displayName: 'Setup'
+    - template: setup.yml
     - template: test.yml
       parameters:
         configurationName: ${{ parameters.configurationName }}

azure/file_cache_job.yml

@@ -17,13 +17,7 @@ jobs:
     - script: make -j$(/usr/bin/nproc) >/dev/null
       displayName: 'Make Build'
     - template: install.yml
-    - script: |
-        set -e
-        sudo service mysql start
-        mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
-        sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
-        sudo -u postgres psql -c "CREATE DATABASE test;"
-      displayName: 'Setup'
+    - template: script.yml
     - template: test.yml
       parameters:
         configurationName: ${{ parameters.configurationName }}

azure/i386/apt.yml

@@ -40,7 +40,6 @@ steps:
                               libpq-dev:i386 \
                               libreadline-dev:i386 \
                               libffi-dev:i386 \
-                              libfreetype6-dev:i386 \
                               libsodium-dev:i386 \
                               ${{ parameters.packages }}
     displayName: 'APT'

azure/i386/job.yml

@@ -29,7 +29,6 @@ jobs:
             --enable-gd \
             --with-jpeg \
             --with-webp \
-            --with-freetype \
             --with-xpm \
             --enable-exif \
             --with-zip \

azure/job.yml

@@ -17,14 +17,7 @@ jobs:
     - script: make -j$(/usr/bin/nproc) >/dev/null
       displayName: 'Make Build'
     - template: install.yml
-    - script: |
-        set -e
-        sudo service mysql start
-        sudo service postgresql start
-        mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
-        sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
-        sudo -u postgres psql -c "CREATE DATABASE test;"
-      displayName: 'Setup'
+    - template: setup.yml
     - template: test.yml
       parameters:
         configurationName: ${{ parameters.configurationName }}

azure/setup.yml

@@ -0,0 +1,9 @@
+steps:
+  - script: |
+      set -e
+      sudo service mysql start
+      sudo service postgresql start
+      mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
+      sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
+      sudo -u postgres psql -c "CREATE DATABASE test;"
+    displayName: 'Setup'