Skip to content

Commit

Permalink
Use the correct channel token when uploading nightly triton conda (py…
Browse files Browse the repository at this point in the history
…torch#109073)

This fixes 2 bugs on triton build workflow:

* Use the wrong conda credential when `UPLOAD_CHANNEL` is not set https://github.com/pytorch/pytorch/actions/runs/6129675580/job/16691419329#step:7:18
* Upload wheel and conda packages when pushing to main in addition to nightly.  This is needed because the binary wheel build on trunk also looks for torchtriton package after the triton pin is updated.

### Testing

https://github.com/pytorch/pytorch/actions/runs/6152447684/job/16694843862?pr=109073#step:7:38 looks correct now.

Pull Request resolved: pytorch#109073
Approved by: https://github.com/atalman
  • Loading branch information
huydhn authored and pytorchmergebot committed Sep 13, 2023
1 parent c9fdfaf commit f6d8ecf
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-triton-wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jobs:
needs: build-wheel
container:
image: continuumio/miniconda3:4.12.0
environment: ${{ (github.event_name == 'push' && (github.event.ref == 'refs/heads/nightly' || startsWith(github.event.ref, 'refs/tags/v'))) && 'conda-aws-upload' || '' }}
environment: ${{ (github.event_name == 'push' && (github.event.ref == 'refs/heads/nightly' || github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/tags/v'))) && 'conda-aws-upload' || '' }}
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
needs: build-conda
container:
image: continuumio/miniconda3:4.12.0
environment: ${{ (github.event_name == 'push' && (github.event.ref == 'refs/heads/nightly' || startsWith(github.event.ref, 'refs/tags/v'))) && 'conda-aws-upload' || '' }}
environment: ${{ (github.event_name == 'push' && (github.event.ref == 'refs/heads/nightly' || github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/tags/v'))) && 'conda-aws-upload' || '' }}
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -283,7 +283,7 @@ jobs:
run: |
set -ex
if [[ "${UPLOAD_CHANNEL}" = "nightly" ]]; then
if [[ "${UPLOAD_CHANNEL:-nightly}" == "nightly" ]]; then
export ANACONDA_API_TOKEN="${CONDA_PYTORCHBOT_TOKEN}"
else
export ANACONDA_API_TOKEN="${CONDA_PYTORCHBOT_TOKEN_TEST}"
Expand Down

0 comments on commit f6d8ecf

Please sign in to comment.