diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-04 14:35:33 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-04 14:35:33 +0200 |
| commit | 7561f91796e88e63c7d9cf125d429a5c35a9b76c (patch) | |
| tree | 70795ba0a230aa4543673470ddeb5f4b47fe6f19 /azure/i386 | |
| parent | 8d346f767944a8a2e166d1b6cc13b94fbdd3a88e (diff) | |
| parent | 9c5d9b492512cf54c8bf791b31fb0926d267ccb0 (diff) | |
| download | php-git-7561f91796e88e63c7d9cf125d429a5c35a9b76c.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix i386 build on Azure
Diffstat (limited to 'azure/i386')
| -rw-r--r-- | azure/i386/apt.yml | 5 | ||||
| -rw-r--r-- | azure/i386/job.yml | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/azure/i386/apt.yml b/azure/i386/apt.yml index 022bf96f30..44b460ea24 100644 --- a/azure/i386/apt.yml +++ b/azure/i386/apt.yml @@ -7,7 +7,8 @@ steps: sudo apt-get update -y | true sudo apt-get install -y gcc-multilib sudo apt-get install -y g++-multilib - sudo apt-get install -y valgrind:i386 + sudo apt-get purge -y libxml2 + # TODO: Reenable postgresql + postgresql-contrib packages once they work again. sudo apt-get install -y bison \ re2c \ locales \ @@ -41,7 +42,5 @@ steps: libffi-dev:i386 \ libfreetype6-dev:i386 \ libsodium-dev:i386 \ - postgresql \ - postgresql-contrib \ ${{ parameters.packages }} displayName: 'APT' diff --git a/azure/i386/job.yml b/azure/i386/job.yml index 8d14bf2d91..df52c96f58 100644 --- a/azure/i386/job.yml +++ b/azure/i386/job.yml @@ -83,8 +83,8 @@ jobs: 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;" + #sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" + #sudo -u postgres psql -c "CREATE DATABASE test;" displayName: 'Setup' - template: test.yml parameters: |