Updating dependencies and Azure pipelines mac OS X builds

cefeiding · Mar 10, 2020 · aab473d · aab473d
1 parent 07e766d
commit aab473d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/WE-UQ.pro b/WE-UQ.pro
@@ -71,4 +71,4 @@ DISTFILES += \
     wImage1.png \
     wImage_DEDM_HRP_Logo
 
-OTHER_FILES += conanfile.py
+OTHER_FILES += conanfile.py azure-pipelines.yml
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -8,16 +8,19 @@ trigger:
 pr:
 - master
 
+variables:
+- group: ConanVariables
+
 strategy:
   matrix:
     linux:
       imageName: "ubuntu-18.04"
       CONAN_GCC_VERSIONS: 7
       CONAN_CLANG_VERSIONS: ""
-    macHighSierra:
-      imageName: "macos-10.13"
-      CONAN_APPLE_CLANG_VERSIONS: 10.0
-    macMojave:
+    macOSXCatalina:
+      imageName: "macos-10.15"
+      CONAN_APPLE_CLANG_VERSIONS: 11.0
+    macOSXMojave:
       imageName: "macos-10.14"
       CONAN_APPLE_CLANG_VERSIONS: 11.0
     windows:

diff --git a/conanfile.py b/conanfile.py
@@ -3,7 +3,7 @@
 class WEUQ(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
     generators = "qmake"
-    requires = "SimCenterCommonQt/0.1.2@simcenter/testing",\
+    requires = "SimCenterCommonQt/0.1.3@simcenter/testing",\
                "SimCenterBackendApplications/1.1.0@simcenter/stable",\
                "mkl-static/2019.4@simcenter/testing"