Merge pull request #118 from mattip/upload3

fix uploading
MacPython · Sep 27, 2023 · b7c93e7 · b7c93e7
2 parents 729f4a5 + 2514655
commit b7c93e7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
@@ -141,6 +141,9 @@ jobs:
         activate-environment: upload
 
     - name: Upload
+      # see https://github.com/marketplace/actions/setup-miniconda for why
+      # `-el {0}` is required.
+      shell: bash -el {0}
       env:
        ANACONDA_SCIENTIFIC_PYTHON_UPLOAD: ${{ secrets.ANACONDA_SCIENTIFIC_PYTHON_UPLOAD }}
       run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -152,7 +152,9 @@ jobs:
         activate-environment: upload
 
     - name: Upload
-      shell: bash
+      # see https://github.com/marketplace/actions/setup-miniconda for why
+      # `-el {0}` is required.
+      shell: bash -el {0}
       env:
        ANACONDA_SCIENTIFIC_PYTHON_UPLOAD: ${{ secrets.ANACONDA_SCIENTIFIC_PYTHON_UPLOAD }}
       run: |

diff --git a/tools/upload_to_anaconda_staging.sh b/tools/upload_to_anaconda_staging.sh
@@ -2,7 +2,6 @@
 # Upload tar.gz and wheels to ananconda.org
 
 upload_wheels() {
-    set -e
     if [[ "$(uname -s)" == CYGWIN* ]]; then
         our_wd=$(cygpath "$START_DIR")
         cd $our_wd
@@ -17,12 +16,14 @@ upload_wheels() {
     else
         echo "Uploading OpenBLAS $VERSION to anaconda.org staging:"
 
+        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" \
-                builds/openblas*.zip libs/openblas*.tar.gz
+                ${tarballs}
+
 
         anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
                 --no-progress --force -u scientific-python-nightly-wheels \