From 736e3d7d8bfc3c77b05e58e9eae8bea4e03d75b5 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 8 May 2024 21:38:09 +0200
Subject: [PATCH] ci/GHA: shorter mbedTLS autotools workaround

Follow-up to 844115393bffb4e92c6569204cbe4cd8e553480d #1381
Closes #1382
---
 .github/workflows/ci.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c41434b0..53c6da18 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -556,22 +556,15 @@ jobs:
         if: ${{ matrix.build == 'autotools' }}
         run: autoreconf -fi
       - name: 'autotools configure'
-        if: ${{ matrix.build == 'autotools' && matrix.crypto.name != 'mbedTLS' }}
+        if: ${{ matrix.build == 'autotools' }}
         run: |
+          # Workaround for GHA ARM runner issue
+          [ '${{ matrix.crypto.name }}' = 'mbedTLS' ] && export LDFLAGS="-L$(brew --prefix)/lib"
           mkdir bld && cd bld && ../configure --enable-werror --enable-debug \
             --with-libz ${{ matrix.crypto.configure }} \
             --disable-docker-tests \
             --disable-sshd-tests \
             || { tail -n 1000 config.log; false; }
-      - name: 'autoconf configure mbedTLS'
-        if: ${{ matrix.build == 'autotools' && matrix.crypto.name == 'mbedTLS' }}
-        run: |
-          mkdir bld && cd bld && LDFLAGS="-L/opt/homebrew/lib" \
-            ../configure --enable-werror --enable-debug \
-            --with-libz ${{ matrix.crypto.configure }} \
-            --disable-docker-tests \
-            --disable-sshd-tests \
-            || { tail -n 1000 config.log; false; }
 
       - name: 'autotools build'
         if: ${{ matrix.build == 'autotools' }}