diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2022-04-16 08:29:07 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-16 08:29:07 -0600 |
| commit | 7b92ceed30c2f24b716f89e89d9852121151077a (patch) | |
| tree | b56f32ec6cb97ecc824336fe9726e08c6397425b | |
| parent | e44181c180807387f0557be5aba916506f53f0f2 (diff) | |
| parent | fb5f1a7415003d3d27bb9fe41a59b9e01aaf53f7 (diff) | |
| download | numpy-7b92ceed30c2f24b716f89e89d9852121151077a.tar.gz | |
Merge pull request #21347 from charris/fix-failing-tests
MAINT: Fix failing simd and cygwin tests.
| -rw-r--r-- | .github/workflows/build_test.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/cygwin.yml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index d754f5e93..6bc92cc99 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -272,7 +272,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 index 10be011e5..b00acf5de 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -24,7 +24,7 @@ jobs: submodules: recursive fetch-depth: 3000 - name: Install Cygwin - uses: egor-tensin/setup-cygwin@v3 + uses: egor-tensin/setup-cygwin@v2 with: platform: x64 install-dir: 'C:\tools\cygwin' @@ -45,6 +45,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 |