Merge pull request #21350 from charris/fix-failing-tests

MAINT: Fix failing simd and cygwin tests.
numpy · Apr 16, 2022 · 894efb1 · 894efb1
2 parents eb99339 + 9141aba
commit 894efb1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -269,7 +269,9 @@ jobs:
           gcc --version &&
           g++ --version &&
           python3 --version &&
-          cd /numpy && python3 setup.py install
+          git config --global --add safe.directory /numpy
+          cd /numpy &&
+          python3 setup.py install
         "
         docker commit the_build the_build
     - name: Run SIMD Tests

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
@@ -36,6 +36,7 @@ jobs:
       - name: Update with Cygwin git
         # fetch-depth=0 above should make this short.
         run: |
+          dash -c "which git; /usr/bin/git config --system --add safe.directory /cygdrive/d/a/numpy/numpy"
           dash -c "which git; /usr/bin/git fetch --all -p"
       - name: Verify python version
         # Make sure it's the Cygwin one, not a Windows one