From 056e29ea595d6a47b70614b3e2ce35612af15507 Mon Sep 17 00:00:00 2001
From: Tom M <tom.mbrt@googlemail.com>
Date: Sat, 27 Nov 2021 10:46:31 +0100
Subject: [PATCH] Make Android CI Pipeline fail correctly

Only execute the steps when succeeded()
---
 .azure/azure-pipelines-android.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.azure/azure-pipelines-android.yml b/.azure/azure-pipelines-android.yml
index 2b69644a..1c6fa2a5 100644
--- a/.azure/azure-pipelines-android.yml
+++ b/.azure/azure-pipelines-android.yml
@@ -184,19 +184,19 @@ jobs:
         wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
         sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main'
       displayName: 'Use recent CMake Version'
-      condition: ne(variables.CACHE_RESTORED, 'true')
+      condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
       enabled: 'false'
 
     - script: |
         sudo apt-get update -y
       displayName: 'Update apt'
-      condition: ne(variables.CACHE_RESTORED, 'true')
+      condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
 
     - script: |
         set -ex
         sudo -E apt-get -yq --no-install-suggests --no-install-recommends install gettext cmake zlib1g-dev autogen automake autoconf libtool pkg-config autotools-dev build-essential meson ninja-build
       displayName: 'apt-get install'
-      condition: ne(variables.CACHE_RESTORED, 'true')
+      condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
 
     - script: |
         set -e
@@ -260,7 +260,7 @@ jobs:
   
       displayName: 'Compile libiconv'
       workingDirectory: $(DEV)
-      condition: ne(variables.CACHE_RESTORED, 'true')
+      condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
 
     - script: |
         set -ex
@@ -276,7 +276,7 @@ jobs:
         popd
       displayName: 'Compile libffi'
       workingDirectory: $(DEV)
-      condition: ne(variables.CACHE_RESTORED, 'true')
+      condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
 
     - script: |
         set -ex
@@ -400,7 +400,7 @@ jobs:
         popd
       displayName: 'Compile gettext'
       workingDirectory: $(DEV)
-      condition: ne(variables.CACHE_RESTORED, 'true')
+      condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
 
     - script: |
         set -ex
@@ -463,7 +463,7 @@ jobs:
         popd
       displayName: 'Compile glib'
       workingDirectory: $(DEV)
-      condition: ne(variables.CACHE_RESTORED, 'true')
+      condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
 
     - template: cmake-android.yml
       parameters:
@@ -559,7 +559,7 @@ jobs:
 
       displayName: 'Create fake oboe.pc'
       workingDirectory: $(DEV)
-      condition: ne(variables.CACHE_RESTORED, 'true')
+      condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
 
     - template: cmake-android.yml
       parameters: