archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Fix i386 build on Azure
This commit is contained in:
Nikita Popov 2020-05-04 14:35:33 +02:00
commit 7561f91796
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
azure/i386/apt.yml
View file

@ -7,7 +7,8 @@ steps:
sudo apt-get update -y | true sudo apt-get update -y | true
sudo apt-get install -y gcc-multilib sudo apt-get install -y gcc-multilib
sudo apt-get install -y g++-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 \ sudo apt-get install -y bison \
re2c \ re2c \
locales \ locales \
@ -41,7 +42,5 @@ steps:
libffi-dev:i386 \ libffi-dev:i386 \
libfreetype6-dev:i386 \ libfreetype6-dev:i386 \
libsodium-dev:i386 \ libsodium-dev:i386 \
postgresql \
postgresql-contrib \
${{ parameters.packages }} ${{ parameters.packages }}
displayName: 'APT' displayName: 'APT'

4
azure/i386/job.yml
View file

@ -83,8 +83,8 @@ jobs:
set -e set -e
sudo service mysql start sudo service mysql start
mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test" 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 "ALTER USER postgres PASSWORD 'postgres';"
sudo -u postgres psql -c "CREATE DATABASE test;" #sudo -u postgres psql -c "CREATE DATABASE test;"
displayName: 'Setup' displayName: 'Setup'
- template: test.yml - template: test.yml
parameters: parameters: