BLD, TST: reformat yml file and force exit code

2 files changed, 63 insertions, 58 deletions

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 3ce70d7ba..1a40104f9 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -194,7 +194,7 @@ jobs:
           python -m pip install dist/*.gz
           pip install -r test_requirements.txt
           cd .. # Can't import numpy within numpy src directory
-          python -c "import numpy; print(numpy.__version__); numpy.test();"
+          python -c "import numpy, sys; print(numpy.__version__); sys.exit(numpy.test() is False)"
 
       - name: Check README rendering for PyPI
         run: |
diff --git a/.github/workflows/windows_meson.yml b/.github/workflows/windows_meson.yml
index 1bf3fdc76..9e82d8fce 100644
--- a/.github/workflows/windows_meson.yml
+++ b/.github/workflows/windows_meson.yml
@@ -20,64 +20,69 @@ jobs:
   meson:
     name: Meson windows build/test
     runs-on: windows-2019
-    if: "github.repository == 'numpy/numpy'"
+    # if: "github.repository == 'numpy/numpy'"
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    - name: Setup Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ env.PYTHON_VERSION }}
 
-      - name: Install dependencies
-        run: |
-          pip install -r build_requirements.txt
-      - name: openblas-libs
-        run: |
-          # Download and install pre-built OpenBLAS library
-          # with 32-bit interfaces
-          # Unpack it in the pkg-config hardcoded path
-          choco install unzip -y
-          choco install wget -y
-          choco install -y --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite
-          wget https://anaconda.org/multibuild-wheels-staging/openblas-libs/v0.3.21/download/openblas-v0.3.21-win_amd64-gcc_10_3_0.zip
-          unzip -d c:\opt openblas-v0.3.21-win_amd64-gcc_10_3_0.zip
-          echo "PKG_CONFIG_PATH=c:\opt\64\lib\pkgconfig;" >> $env:GITHUB_ENV
-      - name: meson-configure
-        run: |
-          meson setup build --prefix=$PWD\build-install -Ddebug=false --optimization 2 --vsenv 
-      - name: meson-build
-        run: |
-          meson compile -C build -v
+    - name: Install dependencies
+      run: |
+        pip install -r build_requirements.txt
+    - name: openblas-libs
+      run: |
+        # Download and install pre-built OpenBLAS library
+        # with 32-bit interfaces
+        # Unpack it in the pkg-config hardcoded path
+        choco install unzip -y
+        choco install wget -y
+        choco install -y --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite
+        wget https://anaconda.org/multibuild-wheels-staging/openblas-libs/v0.3.21/download/openblas-v0.3.21-win_amd64-gcc_10_3_0.zip
+        unzip -d c:\opt openblas-v0.3.21-win_amd64-gcc_10_3_0.zip
+        echo "PKG_CONFIG_PATH=c:\opt\64\lib\pkgconfig;" >> $env:GITHUB_ENV
+    - name: meson-configure
+      run: |
+        meson setup build --prefix=$PWD\build-install -Ddebug=false --optimization 2 --vsenv 
+    - name: meson-build
+      run: |
+        meson compile -C build -v
 
-      - name: meson-install
-        run: |
-          cd build
-          meson install --no-rebuild
-      - name: build-path
-        run: |
-          echo "installed_path=$PWD\build-install\Lib\site-packages" >> $env:GITHUB_ENV
-      - name: post-install
-        run: |
-          $numpy_path = "${env:installed_path}\numpy"
-          $libs_path = "${numpy_path}\.libs"
-          mkdir ${libs_path}
-          $ob_path = "C:/opt/64/bin/"
-          cp $ob_path/*.dll $libs_path
-          # Write _distributor_init.py to load .libs DLLs.
-          python -c "from tools import openblas_support; openblas_support.make_init(r'${numpy_path}')"
+    - name: meson-install
+      run: |
+        cd build
+        meson install --no-rebuild
+    - name: build-path
+      run: |
+        echo "installed_path=$PWD\build-install\Lib\site-packages" >> $env:GITHUB_ENV
+    - name: post-install
+      run: |
+        $numpy_path = "${env:installed_path}\numpy"
+        $libs_path = "${numpy_path}\.libs"
+        mkdir ${libs_path}
+        $ob_path = "C:/opt/64/bin/"
+        cp $ob_path/*.dll $libs_path
+        # Write _distributor_init.py to load .libs DLLs.
+        python -c "from tools import openblas_support; openblas_support.make_init(r'${numpy_path}')"
 
-      - name: prep-test
-        run: |
-          echo "PYTHONPATH=${env:installed_path}" >> $env:GITHUB_ENV
-          python -m pip install -r test_requirements.txt
-          python -m pip install threadpoolctl
-      - name: test
-        run: |
-          mkdir tmp
-          cd tmp
-          python -c"import numpy; print(numpy.show_runtime())"
-          python -c "import numpy; numpy.test(verbose=3)"
+    - name: prep-test
+      run: |
+        echo "PYTHONPATH=${env:installed_path}" >> $env:GITHUB_ENV
+        python -m pip install -r test_requirements.txt
+        python -m pip install threadpoolctl
+
+    - name: test
+      run: |
+        mkdir tmp
+        cd tmp
+        echo "============================================"
+        python -c "import numpy; print(numpy.show_runtime())"
+        echo "============================================"
+        echo "LASTEXITCODE is '$LASTEXITCODE'"
+        python -c "import numpy, sys; sys.exit(numpy.test(verbose=3) is False)"
+        echo "LASTEXITCODE is '$LASTEXITCODE'"