From 87bdb4e736623f8d6c0e22b483622e42456a792d Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 7 Apr 2019 14:28:08 -0400
Subject: [PATCH] Moved the linux 386 steps to azure-pipelines_linux. Next up
 is trying the MinGW-w64 setup again, but using the MinGW-w64 in Linux instead
 of Windows.

---
 azure-pipelines.yml   | 23 -------------------
 azure-pipelines_linux | 52 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 44874fc7..61ab748d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -4,29 +4,6 @@ variables:
   releaseExamples: 'controlgallery cpp-multithread datetime drawtext histogram tester timer'
 
 jobs:
-- job: linux_386_shared
-  displayName: 'Linux 386 Shared'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  workspace:
-    clean: all
-  steps:
-  - template: azure-pipelines/setup-python3.yml
-  - template: azure-pipelines/install-latest-meson.yml
-  - template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml
-  - template: azure-pipelines/configure.yml
-    parameters:
-      beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
-      defaultLibrary: shared
-  - template: azure-pipelines/build.yml
-  - template: azure-pipelines/artifacts.yml
-    parameters:
-      os: linux
-      arch: 386
-      libtype: shared
-      libfiles: libui.so.0
-      osHeader: ui_unix.h
-
 - job: linux_386_static
   displayName: 'Linux 386 Static'
   pool:
diff --git a/azure-pipelines_linux b/azure-pipelines_linux
index 1fbf9b23..a828ec4d 100644
--- a/azure-pipelines_linux
+++ b/azure-pipelines_linux
@@ -4,6 +4,55 @@ variables:
   releaseExamples: 'controlgallery cpp-multithread datetime drawtext histogram tester timer'
 
 jobs:
+
+# linux {
+
+- job: linux_386_shared
+  displayName: 'Linux 386 Shared'
+  pool:
+    vmImage: 'ubuntu-16.04'
+  workspace:
+    clean: all
+  steps:
+  - template: azure-pipelines/setup-python3.yml
+  - template: azure-pipelines/install-latest-meson.yml
+  - template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
+      defaultLibrary: shared
+  - template: azure-pipelines/build.yml
+  - template: azure-pipelines/artifacts.yml
+    parameters:
+      os: linux
+      arch: 386
+      libtype: shared
+      libfiles: libui.so.0
+      osHeader: ui_unix.h
+
+- job: linux_386_static
+  displayName: 'Linux 386 Static'
+  pool:
+    vmImage: 'ubuntu-16.04'
+  workspace:
+    clean: all
+  steps:
+  - template: azure-pipelines/setup-python3.yml
+  - template: azure-pipelines/install-latest-meson.yml
+  - template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml
+  - template: azure-pipelines/configure.yml
+    parameters:
+      beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
+      defaultLibrary: static
+  - template: azure-pipelines/build.yml
+  - template: azure-pipelines/artifacts.yml
+    parameters:
+      os: linux
+      arch: 386
+      libtype: static
+      libfiles: libui.a
+      osHeader: ui_unix.h
+
 - job: linux_amd64_shared
   displayName: 'Linux amd64 Shared'
   pool:
@@ -48,11 +97,12 @@ jobs:
       libfiles: libui.a
       osHeader: ui_unix.h
 
+# }
+
 # mac {
 
 # TODO beforeConfigure/beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path)?
 
-
 - job: darwin_amd64_shared
   displayName: 'Darwin amd64 Shared'
   pool: