From 9c5d9b492512cf54c8bf791b31fb0926d267ccb0 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 4 May 2020 12:16:45 +0200
Subject: Fix i386 build on Azure

Disabling postgresql entirely for now, because I can't figure out
how to fix it. Something broke big time with i386 packages on
Azure pipelines.
---
 azure/i386/apt.yml | 5 ++---
 azure/i386/job.yml | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'azure/i386')

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 5ada61b415..83e8705f0f 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:
-- 
cgit v1.2.1