From 3b8bbbbd1609c638a3d3d0acb148a33dedb67be3 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 3 Dec 2019 23:21:09 +0100
Subject: azure: add more builds

... removed two from travis (that now runs on azure instead)

Closes #4671
---
 .azure-pipelines.yml | 65 ++++++++++++++++++++++++++++++++++++++++++++++------
 .travis.yml          | 22 ------------------
 2 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 5e3162cc8..347edea59 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -9,12 +9,63 @@ trigger:
 pool:
   vmImage: 'ubuntu-latest'
 
-steps:
-- script: ./buildconf && ./configure
-  displayName: 'Run configure'
+jobs:
+  - job: vanilla_ubuntu
+    displayName: default configure
+    steps:
+    - script: ./buildconf && ./configure
+      displayName: 'Run configure'
 
-- script: make
-  displayName: 'make'
+    - script: make
+      displayName: 'make'
 
-- script: make test-nonflaky
-  displayName: 'test'
+    - script: make test-nonflaky
+      displayName: 'test'
+
+  - job: disable_ipv6
+    displayName: without IPv6
+    steps:
+    - script: ./buildconf && ./configure --disable-ipv6
+      displayName: 'Run configure --disable-ipv6'
+
+    - script: make
+      displayName: 'make'
+
+    - script: make test-nonflaky
+      displayName: 'test'
+
+  - job: disable_http_smtp_imap
+    displayName: without HTTP/SMTP/IMAP
+    steps:
+    - script: ./buildconf && ./configure --disable-http --disable-smtp --disable-imap
+      displayName: 'Run configure'
+
+    - script: make
+      displayName: 'make'
+
+    - script: make test-nonflaky
+      displayName: 'test'
+
+  - job: disable_thredres
+    displayName: sync resolver
+    steps:
+    - script: ./buildconf && ./configure --disable-threaded-resolver
+      displayName: 'Run configure'
+
+    - script: make
+      displayName: 'make'
+
+    - script: make test-nonflaky
+      displayName: 'test'
+
+  - job: http_only
+    displayName: HTTP only
+    steps:
+    - script: ./buildconf && ./configure --disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap --disable-ldap --disable-pop3 --disable-rtmp --disable-rtsp --disable-scp --disable-sftp --disable-smb --disable-smtp --disable-telnet --disable-tftp
+      displayName: 'Run configure'
+
+    - script: make
+      displayName: 'make'
+
+    - script: make test-nonflaky
+      displayName: 'test'
diff --git a/.travis.yml b/.travis.yml
index 94e13bfeb..16bbb1c3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,12 +57,6 @@ matrix:
                   packages:
                       - *common_packages
                       - libssh-dev
-        - os: linux
-          compiler: gcc
-          dist: trusty
-          env:
-              - T=normal C="--disable-http --disable-smtp --disable-imap"
-              - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
         - os: linux
           compiler: gcc
           dist: trusty
@@ -228,22 +222,6 @@ matrix:
                       - libgnutls28-dev
                       - libpsl-dev
                       - libbrotli-dev
-        - os: linux
-          compiler: clang
-          dist: xenial
-          env:
-              - T=debug C="--disable-threaded-resolver"
-              - OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"
-          addons:
-              apt:
-                  sources:
-                      - *common_sources
-                      - llvm-toolchain-xenial-7
-                  packages:
-                      - *common_packages
-                      - clang-7
-                      - libpsl-dev
-                      - libbrotli-dev
         - os: linux
           compiler: clang
           dist: xenial
-- 
cgit v1.2.3