From 76639ecf3321a3a01b8b274db1307cf320ef156c Mon Sep 17 00:00:00 2001
From: derselbst <tom.mbrt@googlemail.com>
Date: Mon, 20 Dec 2021 17:08:14 +0100
Subject: [PATCH] Cleanup Android CI Pipeline

Always print out cmake log files
---
 .azure/azure-pipelines-android.yml | 42 ------------------------------
 .azure/cmake-android.yml           |  9 +++++++
 2 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/.azure/azure-pipelines-android.yml b/.azure/azure-pipelines-android.yml
index 1c6fa2a5..4558c06f 100644
--- a/.azure/azure-pipelines-android.yml
+++ b/.azure/azure-pipelines-android.yml
@@ -470,26 +470,10 @@ jobs:
         sourceDir: 'libogg-$(OGG_VERSION)'
         cmakeArgs: '-DINSTALL_DOCS=0'
 
-    - script: |
-        ls -la libogg-${OGG_VERSION}/build/CMakeFiles/
-        cat libogg-${OGG_VERSION}/build/CMakeFiles/CMakeError.log
-        true
-      displayName: 'Print OGG Cmake Error Log'
-      condition: always()
-      workingDirectory: $(DEV)
-
     - template: cmake-android.yml
       parameters:
         sourceDir: 'libvorbis-$(VORBIS_VERSION)'
 
-    - script: |
-        ls -la libvorbis-${VORBIS_VERSION}/build/CMakeFiles/
-        cat libvorbis-${VORBIS_VERSION}/build/CMakeFiles/CMakeError.log
-        true
-      displayName: 'Print Vorbis Cmake Error Log'
-      condition: always()
-      workingDirectory: $(DEV)
-
     # flac uses c99 macros, but doesnt specify a standard, so we need to do it explicitly.
     # On i686, they invoke yasm with -fstack-protector-strong flag... turn off asm optimizations.
     - template: cmake-android.yml
@@ -497,42 +481,17 @@ jobs:
         sourceDir: 'flac-$(FLAC_VERSION)'
         cmakeArgs: '-DCMAKE_C_STANDARD=99 -DCMAKE_C_STANDARD_REQUIRED=1 -DWITH_ASM=0 -DBUILD_CXXLIBS=0 -DBUILD_PROGRAMS=0 -DBUILD_EXAMPLES=0 -DBUILD_DOCS=0 -DINSTALL_MANPAGES=0'
 
-    - script: |
-        ls -la flac-${FLAC_VERSION}/build/CMakeFiles/
-        cat flac-${FLAC_VERSION}/build/CMakeFiles/CMakeError.log
-        true
-      displayName: 'Print FLAC Cmake Error Log'
-      condition: always()
-      workingDirectory: $(DEV)
-
     # another broken xiph project that doesn't specify the C standard and keeps complaining of you don't have C99
     - template: cmake-android.yml
       parameters:
         sourceDir: 'opus-$(OPUS_VERSION)'
         cmakeArgs: '-DBUILD_PROGRAMS=0 -DOPUS_MAY_HAVE_NEON=1 -DCMAKE_C_STANDARD=99 -DCMAKE_C_STANDARD_REQUIRED=1'
 
-    - script: |
-        ls -la opus-${OPUS_VERSION}/build/CMakeFiles/
-        cat opus-${OPUS_VERSION}/build/CMakeFiles/CMakeError.log
-        cat opus-${OPUS_VERSION}/build/CMakeFiles/CMakeOutput.log
-        true
-      displayName: 'Print OPUS Cmake Error Log'
-      condition: always()
-      workingDirectory: $(DEV)
-
     - template: cmake-android.yml
       parameters:
         sourceDir: 'libsndfile-$(SNDFILE_VERSION)'
         cmakeArgs: '-DBUILD_PROGRAMS=0 -DBUILD_EXAMPLES=0'
 
-    - script: |
-        ls -la libsndfile-${SNDFILE_VERSION}/build/CMakeFiles/
-        cat libsndfile-${SNDFILE_VERSION}/build/CMakeFiles/CMakeError.log
-        true
-      displayName: 'Print libsndfile Cmake Error Log'
-      condition: always()
-      workingDirectory: $(DEV)
-
     - template: cmake-android.yml
       parameters:
         sourceDir: 'oboe-$(OBOE_VERSION)'
@@ -598,7 +557,6 @@ jobs:
         sourceDir: '.'
         condition: succeeded()
         installCommand: 'cp *.so ${PREFIX}/lib/'
-      
 
     - script: |
         ls -Rg $(PREFIX)
diff --git a/.azure/cmake-android.yml b/.azure/cmake-android.yml
index 74cd4099..4ba3646f 100644
--- a/.azure/cmake-android.yml
+++ b/.azure/cmake-android.yml
@@ -56,3 +56,12 @@ steps:
   displayName: 'Compile ${{ parameters.sourceDir }}'
   workingDirectory: ${{ parameters.workDir }}
   condition: ${{ parameters.condition }}
+
+- script: |
+    ls -la ${{ parameters.sourceDir }}/build/CMakeFiles/
+    cat ${{ parameters.sourceDir }}/build/CMakeFiles/CMakeError.log
+    cat ${{ parameters.sourceDir }}/build/CMakeFiles/CMakeOutput.log
+    true
+  displayName: 'Print ${{ parameters.sourceDir }} Cmake Error Log'
+  condition: or(succeeded(), failed())
+  workingDirectory: ${{ parameters.workDir }}