From 74c88299c7f032c32b1e5c657d962d22aca75b57 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Sat, 2 Nov 2019 18:09:59 +0100
Subject: Use ubuntu 18.04 with more compiler versions on azure. On travis
 reduce the amount of configurations because they are already running on azure
 and they keep timing out on travis.

    * .travis.yml:
    * azure-pipelines.yml:
---
 .travis.yml         | 23 +----------------------
 azure-pipelines.yml | 30 +++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e9cc4d13b4a..6a5badede77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: bionic
 group: travis_latest
 language: cpp
 os:
@@ -25,33 +26,11 @@ env:
 
 matrix:
   include:
-    - compiler: gcc
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - libxerces-c-dev
-            - libssl-dev
-            - g++-7
-      env: COMPILER=g++-7 VERSIONED=1 TAO=1 ACETESTS=1
-    - compiler: gcc
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - libxerces-c-dev
-            - libssl-dev
-            - g++-6
-      env: COMPILER=g++-6 VERSIONED=1 TAO=1 ACETESTS=1
     - os: osx
       env: COMPILER=clang++ VERSIONED=1 TAO=1 ACETESTS=1
 
 addons:
   apt:
-    sources:
-      - ubuntu-toolchain-r-test
     packages:
       - libssl-dev
       - libxerces-c-dev
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ddca4e85fa4..447d280fe03 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -229,12 +229,13 @@ jobs:
 - job: Linux
   timeoutInMinutes: 90
   pool:
-    vmImage: ubuntu-16.04
+    vmImage: ubuntu-latest
   strategy:
     matrix:
-      GCC4:
-        CC: gcc
-        CXX: g++
+      GCC48:
+        CC: gcc-4.8
+        CXX: g++-4.8
+        PackageDeps: g++-4.8
         platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
       GCC6:
         CC: gcc-6
@@ -251,29 +252,36 @@ jobs:
         CXX: g++-8
         PackageDeps: g++-8
         platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+      GCC9:
+        CC: gcc-9
+        CXX: g++-9
+        PackageDeps: g++-9
+        platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
       CLANG5:
         CC: clang-5.0
         CXX: clang++-5.0
         PackageDeps: clang-5.0
-        Repo: llvm-toolchain-$(lsb_release -cs)-5.0
         platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
       CLANG6:
         CC: clang-6.0
         CXX: clang++-6.0
         PackageDeps: clang-6.0
-        Repo: llvm-toolchain-$(lsb_release -cs)-6.0
         platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
       CLANG7:
         CC: clang-7
         CXX: clang++-7
         PackageDeps: clang-7
-        Repo: llvm-toolchain-$(lsb_release -cs)-7
         platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
       CLANG8:
         CC: clang-8
         CXX: clang++-8
         PackageDeps: clang-8
-        Repo: llvm-toolchain-$(lsb_release -cs)-8
+        platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
+      CLANG9:
+        CC: clang-9
+        CXX: clang++-9
+        PackageDeps: clang-9
+        Repo: llvm-toolchain-$(lsb_release -cs)-9
         platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
   steps:
   - script: |
@@ -282,7 +290,6 @@ jobs:
     displayName: Add repository ($(Repo))
     condition: and(succeeded(), ne(variables['Repo'], ''))
   - script: |
-      sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
       sudo apt-get --yes update
       sudo apt-get --yes install libxerces-c-dev libssl-dev $(PackageDeps)
     displayName: install system package dependencies
@@ -295,7 +302,8 @@ jobs:
       'versioned_namespace=1' >> $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features
     displayName: Create default.features file
   - powershell: |
-      'xerces3=1' > $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
+      'c++11=1' > $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
+      'xerces3=1' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
       'ssl=1' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
       "$(platform_file)" >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
     displayName: Create platform_macros file
@@ -313,7 +321,7 @@ jobs:
 - job: MacOSX
   timeoutInMinutes: 90
   pool:
-    vmImage: macOS-10.14
+    vmImage: macOS-latest
   steps:
   - powershell: |
       '#include "ace/config-macosx.h"' > $(ACE_ROOT)/ace/config.h
-- 
cgit v1.2.1