Merge pull request #176 from mattip/trigger2

fix another place when builds are triggered manually
MacPython · Aug 8, 2024 · e8a5028 · e8a5028
2 parents 98c4d61 + 48cb466
commit e8a5028
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
@@ -141,8 +141,9 @@ jobs:
 
     - name: Build and test wheel
       run: |
-        if [[ "$NIGHTLY" = "true" ]]; then
+        if [ "$NIGHTLY" = "true"  -a  "$BRANCH_NAME" = "main" ]; then
           # Set the pyproject.toml version: convert v0.3.24-30-g138ed79f to 0.3.34.30
+          # This will fail if `git describe --tags` hits a tag like v0.3.27
           version=$(cd OpenBLAS && git describe --tags --abbrev=8 | sed -e "s/^v\(.*\)-g.*/\1/" | sed -e "s/-/./g")
           sed -e "s/^version = .*/version = \"${version}\"/" -i.bak pyproject.toml
         fi

diff --git a/tools/upload_to_anaconda_staging.sh b/tools/upload_to_anaconda_staging.sh
@@ -29,13 +29,5 @@ upload_wheels() {
         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}
     fi
 }