From b6ed1cded14153a1b7ba3bf8bb59710f910cde49 Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Wed, 20 Apr 2022 09:48:07 -0600
Subject: [PATCH] MAINT: Fix failing Python 3.8 32-bit Windows test.

---
 .github/workflows/build_test.yml | 3 ++-
 azure-pipelines.yml              | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 07209e391d3e..afc78b20ae9a 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -232,7 +232,8 @@ jobs:
 
   armv7_simd_test:
     needs: [smoke_test]
-    runs-on: ubuntu-latest
+    # make sure this (20.04) matches the base docker image (focal) below
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
       with:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index be0f0a214fbf..0e7e097db51f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -80,8 +80,10 @@ stages:
     - script: |
             docker run -v $(pwd):/numpy -e CFLAGS="-msse2 -std=c99 -UNDEBUG" \
             -e F77=gfortran-5 -e F90=gfortran-5 quay.io/pypa/manylinux2014_i686 \
-            /bin/bash -xc "cd numpy && \
-            /opt/python/cp38-cp38/bin/python -mvenv venv &&\
+            /bin/bash -xc " \
+            git config --global --add safe.directory /numpy && \
+            cd /numpy && \
+            /opt/python/cp38-cp38/bin/python -mvenv venv && \
             source venv/bin/activate && \
             target=\$(python3 tools/openblas_support.py) && \
             cp -r \$target/lib/* /usr/lib && \