reorder uploads to do wheels first

Author: mattip

.github/workflows/posix.yml

@@ -127,13 +127,13 @@ jobs:
 
     - uses: actions/[email protected]
       with:
-        name: openblas-${{ matrix.os }}-${{ matrix.PLAT }}-${{ matrix.INTERFACE64 }}-${{ matrix.MB_ML_LIBC }}
-        path: libs/openblas*.tar.gz
+        name: wheels-${{ matrix.os }}-${{ matrix.PLAT }}-${{ matrix.INTERFACE64 }}-${{ matrix.MB_ML_LIBC }}
+        path: dist/scipy_openblas*.whl
 
     - uses: actions/[email protected]
       with:
-        name: wheels-${{ matrix.os }}-${{ matrix.PLAT }}-${{ matrix.INTERFACE64 }}-${{ matrix.MB_ML_LIBC }}
-        path: dist/scipy_openblas*.whl
+        name: openblas-${{ matrix.os }}-${{ matrix.PLAT }}-${{ matrix.INTERFACE64 }}-${{ matrix.MB_ML_LIBC }}
+        path: libs/openblas*.tar.gz
 
     - uses: conda-incubator/[email protected]
       with:

.github/workflows/windows.yml

@@ -126,13 +126,13 @@ jobs:
 
     - uses: actions/[email protected]
       with:
-        name: openblas-${{matrix.plat }}-${{ matrix.INTERFACE64 }}
-        path: builds/openblas*.zip
+        name: wheels-${{matrix.plat }}-${{ matrix.INTERFACE64 }}
+        path: dist/scipy_openblas*.whl
 
     - uses: actions/[email protected]
       with:
-        name: wheels-${{matrix.plat }}-${{ matrix.INTERFACE64 }}
-        path: dist/scipy_openblas*.whl
+        name: openblas-${{matrix.plat }}-${{ matrix.INTERFACE64 }}
+        path: builds/openblas*.zip
 
     - name: Test 64-bit interface wheel
       if: matrix.INTERFACE64 == '1'

tools/build_steps.sh

@@ -191,6 +191,7 @@ function do_build_lib {
         sed -e "s/\(^Cflags.*\)/\1 -DBLAS_SYMBOL_PREFIX=scipy_ -DBLAS_SYMBOL_SUFFIX=64_/" -i.bak $BUILD_PREFIX/lib/pkgconfig/scipy-openblas.pc
     else
         sed -e "s/\(^Cflags.*\)/\1 -DBLAS_SYMBOL_PREFIX=scipy_/" -i.bak $BUILD_PREFIX/lib/pkgconfig/scipy-openblas.pc
+    rm $BUILD_PREFIX/lib/pkgconfig/scipy-openblas.pc.bak
     fi
 
     local out_name="openblas${symbolsuffix}-${version}-${plat_tag}${suff}.tar.gz"

tools/upload_to_anaconda_staging.sh

@@ -18,16 +18,16 @@ upload_wheels() {
     else
         echo "Uploading OpenBLAS $VERSION to anaconda.org staging:"
 
+        anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
+                --no-progress --force -u scientific-python-nightly-wheels \
+                dist/scipy_openblas*.whl
+
         tarballs=$(ls -d builds/openblas*.zip libs/openblas*.tar.gz 2>/dev/null)
         anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
                 --no-progress --force -u scientific-python-nightly-wheels \
                 -t file -p "openblas-libs" -v "$VERSION" \
                 -d "OpenBLAS for multibuild wheels" \
                 -s "OpenBLAS for multibuild wheels" \
                 ${tarballs}
-
-        anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
-                --no-progress --force -u scientific-python-nightly-wheels \
-                dist/scipy_openblas*.whl
     fi
 }