Skip to content

Commit e8a5028

Browse files
authored
Merge pull request #176 from mattip/trigger2
fix another place when builds are triggered manually
2 parents 98c4d61 + 48cb466 commit e8a5028

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

.github/workflows/posix.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,9 @@ jobs:
141141
142142
- name: Build and test wheel
143143
run: |
144-
if [[ "$NIGHTLY" = "true" ]]; then
144+
if [ "$NIGHTLY" = "true" -a "$BRANCH_NAME" = "main" ]; then
145145
# Set the pyproject.toml version: convert v0.3.24-30-g138ed79f to 0.3.34.30
146+
# This will fail if `git describe --tags` hits a tag like v0.3.27
146147
version=$(cd OpenBLAS && git describe --tags --abbrev=8 | sed -e "s/^v\(.*\)-g.*/\1/" | sed -e "s/-/./g")
147148
sed -e "s/^version = .*/version = \"${version}\"/" -i.bak pyproject.toml
148149
fi

tools/upload_to_anaconda_staging.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,5 @@ upload_wheels() {
2929
anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
3030
--no-progress --force -u scientific-python-nightly-wheels \
3131
dist/scipy_openblas*.whl
32-
33-
tarballs=$(ls -d builds/openblas*.zip libs/openblas*.tar.gz 2>/dev/null)
34-
anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
35-
--no-progress --force -u scientific-python-nightly-wheels \
36-
-t file -p "openblas-libs" -v "$VERSION" \
37-
-d "OpenBLAS for multibuild wheels" \
38-
-s "OpenBLAS for multibuild wheels" \
39-
${tarballs}
4032
fi
4133
}

0 commit comments

Comments
 (0)