From 2e0f54822eee6fcc36f2a021b16f0872efa7620c Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Fri, 5 Nov 2021 15:36:25 +0000
Subject: [PATCH] Simplify CI jobs, and merge DMG generation into one job

This commit merges the macOSRelease job into one unified Mac build job.

Using Azure Pipelines conditionals (AND), we check for the build type being an release, and the build agent being Big Sur.

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
---
 azure-pipelines.yml | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3a63c751..dd69813b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -121,28 +121,9 @@ jobs:
       displayName: Install Qt5 and pkg-config prereqs
     - script: sh -x ./clean_build.sh
       displayName: Clean Build
-
-- job: macOSRelease
-  displayName: macOS Universal Binary Release Builds
-  pool:
-    vmImage: "macOS-11"
-  variables:
-    VERBOSE: 1
-    TERM: xterm-256color
-    B_BUILD_TYPE: Release
-    BARRIER_VERSION_STAGE: Release
-  steps:
-    - script: rm -rf /usr/local/opt/openssl
-      displayName: Remove incompatible OpenSSL 1.0.2t from macOS-10.14 vmImage
-    - script: brew reinstall openssl
-      displayName: Installed newer OpenSSL 1.1.x
-    - script: brew install pkg-config qt5
-      displayName: Install Qt5 and pkg-config prereqs
-    - script: sh -x ./clean_build.sh
-      displayName: Clean Build
     - task: PublishBuildArtifacts@1
-      displayName: Publish Release DMG
-      condition: eq(variables['B_BUILD_TYPE'], 'Release')
+      displayName: Publish Release DMG if on Big Sur agent
+      condition: and(eq(variables['B_BUILD_TYPE'], 'Release'), eq(variables['imageName'], 'macOS-11'))
       inputs:
         pathtoPublish: build/bundle
         artifactName: Universal Binary for macOS