From a173da91dab3729c1c1b77720fe379347ee1db86 Mon Sep 17 00:00:00 2001
From: derselbst <tom.mbrt@googlemail.com>
Date: Mon, 20 Dec 2021 18:58:14 +0100
Subject: [PATCH] Update libffi in Android CI pipeline

---
 .azure/azure-pipelines-android.yml | 6 +++---
 .azure/cmake-android.yml           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.azure/azure-pipelines-android.yml b/.azure/azure-pipelines-android.yml
index 4558c06f..0ff0d528 100644
--- a/.azure/azure-pipelines-android.yml
+++ b/.azure/azure-pipelines-android.yml
@@ -33,7 +33,7 @@ schedules:
 variables:
   ICONV_VERSION: '1.16'
   # Use recent master libffi, because 3.3 is broken: checking host system type... Invalid configuration `arm-none-linux-eabi': machine `arm-none-linux' not recognized
-  FFI_VERSION: 'dd5bd03075149d7cf8441875c1a344e8beb57dde'
+  FFI_VERSION: '3.4.2'
   GETTEXT_VERSION: '0.21'
   #need to switch to meson build system to use a more recent version 
   GLIB_VERSION: '2.58'
@@ -136,7 +136,7 @@ jobs:
         wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz
         tar zxf libiconv-${ICONV_VERSION}.tar.gz
 
-        wget -O libffi-${FFI_VERSION}.tar.gz https://github.com/libffi/libffi/archive/${FFI_VERSION}.tar.gz
+        wget -O libffi-${FFI_VERSION}.tar.gz https://github.com/libffi/libffi/releases/download/v${FFI_VERSION}/libffi-${FFI_VERSION}.tar.gz
         tar zxf libffi-${FFI_VERSION}.tar.gz
 
         wget http://ftp.gnu.org/pub/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz
@@ -561,7 +561,7 @@ jobs:
     - script: |
         ls -Rg $(PREFIX)
       displayName: 'Show cross-compiled files in $(PREFIX)'
-      condition: always()
+      condition: or(succeeded(), failed())
 
     - script: |
         set -ex
diff --git a/.azure/cmake-android.yml b/.azure/cmake-android.yml
index 4ba3646f..a906bc94 100644
--- a/.azure/cmake-android.yml
+++ b/.azure/cmake-android.yml
@@ -11,7 +11,7 @@ parameters:
   default: $(DEV)
 - name: condition
   type: string
-  default: ne(variables.CACHE_RESTORED, 'true')
+  default: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
 - name: installCommand
   type: string
   default: 'make install'
@@ -63,5 +63,5 @@ steps:
     cat ${{ parameters.sourceDir }}/build/CMakeFiles/CMakeOutput.log
     true
   displayName: 'Print ${{ parameters.sourceDir }} Cmake Error Log'
-  condition: or(succeeded(), failed())
+  condition: or(${{ parameters.condition }}, failed())
   workingDirectory: ${{ parameters.workDir }}