From 6303062e0edc9a2960eebce9c724eba4a8ab96fb Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 8 Aug 2024 11:17:04 +0300 Subject: [PATCH 1/2] fix another place when builds are triggered manually --- .github/workflows/posix.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index c766dc7..00c45ca 100644 --- 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 From 48cb4663daedc3b58fffc12c05c73cef2a17a44d Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 8 Aug 2024 11:25:52 +0300 Subject: [PATCH 2/2] do not upload tarballs --- tools/upload_to_anaconda_staging.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/upload_to_anaconda_staging.sh b/tools/upload_to_anaconda_staging.sh index 6b22aba..cce7147 100644 --- 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 }