Skip to content

Commit

Permalink
Merge pull request #111 from honno/change-anaconda-org
Browse files Browse the repository at this point in the history
Upload to `scientific-python-nightly-wheels`, change nightly frequency to weekly
  • Loading branch information
mattip committed Jul 24, 2023
2 parents 903f2bc + 3749c72 commit 544c6b9
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:

- name: Upload
env:
OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN: ${{ secrets.MULTIBUILD_WHEELS_STAGING_ACCESS }}
ANACONDA_SCIENTIFIC_PYTHON_UPLOAD: ${{ secrets.ANACONDA_SCIENTIFIC_PYTHON_UPLOAD }}
run: |
# Pin urllib3<2 due to github.com/Anaconda-Platform/anaconda-client/issues/654
conda install "urllib3<2" anaconda-client
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/multibuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [ main ]
workflow_dispatch: null
schedule:
- cron: '0 0 * * *'
- cron: '0 0 * * 0'

jobs:
build:
Expand Down Expand Up @@ -64,8 +64,6 @@ jobs:
MB_ML_VER: ${{ matrix.MB_ML_VER }}
INTERFACE64: ${{ matrix.INTERFACE64 }}
BUILD_DIR: ${{ github.workspace }}
SCIPY_WHEELS_NIGHTLY_ACCESS: ${{ secrets.SCIPY_WHEELS_NIGHTLY_ACCESS }}
MULTIBUILD_WHEELS_STAGING_ACCESS: ${{ secrets.MULTIBUILD_WHEELS_STAGING_BUILD }}
PLAT: ${{ matrix.PLAT }}

steps:
Expand Down Expand Up @@ -127,10 +125,10 @@ jobs:
- name: Upload tarballs
run: |
set -ex
TOKEN=${{ secrets.MULTIBUILD_WHEELS_STAGING_ACCESS }}
TOKEN=${{ secrets.ANACONDA_SCIENTIFIC_PYTHON_UPLOAD }}
if [ "$TOKEN" == "" ]; then
# The token is available when under the MacPython org, not on forks
echo "secrets.MULTIBUILD_WHEELS_STAGING_ACCESS is not defined: skipping";
echo "secrets.ANACONDA_SCIENTIFIC_PYTHON_UPLOAD is not defined: skipping";
else
# Pin urllib3<2 due to github.com/Anaconda-Platform/anaconda-client/issues/654
pip install "urllib3<2.0.0"
Expand All @@ -139,7 +137,7 @@ jobs:
# option to the "upload" command
args=(
-t ${TOKEN} upload
--no-progress -u multibuild-wheels-staging
--no-progress -u scientific-python-nightly-wheels
-t file -p "openblas-libs"
-d "OpenBLAS for multibuild wheels"
-s "OpenBLAS for multibuild wheels"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This is a repository to trigger builds of OpenBLAS on Travis-CI (for aarch64,
ppc64, s390x) and github actions for all the others.

The OpenBLAS libraries get uploaded to
https://anaconda.org/multibuild-wheels-staging/openblas-libs/files
https://anaconda.org/scientific-python-nightly-wheels/openblas-libs/files

A project using these libraries, for Manylinux or macOS, will need the
``gfortran-install`` submodule used here, from
Expand Down
8 changes: 4 additions & 4 deletions tools/upload_to_anaconda_staging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ pushd OpenBLAS
VERSION=$(git describe --tags --abbrev=8)
popd

if [ "$OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN" == "" ]; then
echo "OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN is not defined: skipping."
if [ "$ANACONDA_SCIENTIFIC_PYTHON_UPLOAD" == "" ]; then
echo "ANACONDA_SCIENTIFIC_PYTHON_UPLOAD is not defined: skipping."
else
echo "Uploading OpenBLAS $VERSION to anaconda.org staging:"
ls -lh builds/openblas*.zip

anaconda -t $OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN upload \
--no-progress --force -u multibuild-wheels-staging \
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" \
Expand Down
8 changes: 4 additions & 4 deletions travis-ci/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,11 @@ function do_build_lib {
}

function upload_to_anaconda {
if [ "$OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN" == "" ]; then
echo "OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN is not defined: skipping."
if [ "$ANACONDA_SCIENTIFIC_PYTHON_UPLOAD" == "" ]; then
echo "ANACONDA_SCIENTIFIC_PYTHON_UPLOAD is not defined: skipping."
else
anaconda -t $OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN upload \
--no-progress --force -u multibuild-wheels-staging \
anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
--no-progress --force -u scientific-python-nightly-wheels \
-t file -p "openblas-libs" \
-v "$(cd OpenBLAS && git describe --tags --abbrev=8)" \
-d "OpenBLAS for multibuild wheels" \
Expand Down

0 comments on commit 544c6b9

Please sign in to comment.