Skip to content

Commit ef01e24

Browse files
authored
[CI] Install conda package from workspace (#881)
When running smoke test, proper way to install conda package is to install from workspace, instead of installing from archive. Otherwise the dependencies are not properly installed conda/conda#1884 For this, we pass the whole `conda-bld` directory from conda package build job to upload job then smoke test job. `torchaudio` does not have a mandatory third-party python package dependency, so this was not an issue. See also pytorch/text#803
1 parent 52a18a9 commit ef01e24

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

.circleci/config.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ jobs:
144144
- store_artifacts:
145145
path: /opt/conda/conda-bld/linux-64
146146
- persist_to_workspace:
147-
root: /opt/conda/conda-bld/linux-64
147+
root: /opt/conda
148148
paths:
149-
- "*"
149+
- "conda-bld/*"
150150

151151
binary_macos_wheel:
152152
<<: *binary_common
@@ -192,9 +192,9 @@ jobs:
192192
- store_artifacts:
193193
path: /Users/distiller/miniconda3/conda-bld/osx-64
194194
- persist_to_workspace:
195-
root: /Users/distiller/miniconda3/conda-bld/osx-64
195+
root: /Users/distiller/miniconda3
196196
paths:
197-
- "*"
197+
- "conda-bld/*"
198198

199199
binary_windows_wheel:
200200
<<: *binary_common
@@ -231,9 +231,9 @@ jobs:
231231
- store_artifacts:
232232
path: C:/tools/miniconda3/conda-bld/win-64
233233
- persist_to_workspace:
234-
root: C:/tools/miniconda3/conda-bld/win-64
234+
root: C:/tools/miniconda3
235235
paths:
236-
- "*"
236+
- "conda-bld/*"
237237

238238
# Requires org-member context
239239
binary_conda_upload:
@@ -248,7 +248,7 @@ jobs:
248248
# Prevent credential from leaking
249249
conda install -yq anaconda-client
250250
set -x
251-
anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload ~/workspace/*.tar.bz2 -u "pytorch-${UPLOAD_CHANNEL}" --label main --no-progress --force
251+
anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload ~/workspace/conda-bld/*/*.tar.bz2 -u "pytorch-${UPLOAD_CHANNEL}" --label main --no-progress --force
252252
253253
# Requires org-member context
254254
binary_wheel_upload:
@@ -284,7 +284,7 @@ jobs:
284284
set -x
285285
source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION}
286286
conda install -v -y -c pytorch-${UPLOAD_CHANNEL} pytorch
287-
conda install -v -y $(ls ~/workspace/torchaudio*.tar.bz2)
287+
conda install -v -y -c file://$HOME/workspace/conda-bld torchaudio
288288
- run:
289289
name: smoke test
290290
command: |

.circleci/config.yml.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ jobs:
144144
- store_artifacts:
145145
path: /opt/conda/conda-bld/linux-64
146146
- persist_to_workspace:
147-
root: /opt/conda/conda-bld/linux-64
147+
root: /opt/conda
148148
paths:
149-
- "*"
149+
- "conda-bld/*"
150150

151151
binary_macos_wheel:
152152
<<: *binary_common
@@ -192,9 +192,9 @@ jobs:
192192
- store_artifacts:
193193
path: /Users/distiller/miniconda3/conda-bld/osx-64
194194
- persist_to_workspace:
195-
root: /Users/distiller/miniconda3/conda-bld/osx-64
195+
root: /Users/distiller/miniconda3
196196
paths:
197-
- "*"
197+
- "conda-bld/*"
198198

199199
binary_windows_wheel:
200200
<<: *binary_common
@@ -231,9 +231,9 @@ jobs:
231231
- store_artifacts:
232232
path: C:/tools/miniconda3/conda-bld/win-64
233233
- persist_to_workspace:
234-
root: C:/tools/miniconda3/conda-bld/win-64
234+
root: C:/tools/miniconda3
235235
paths:
236-
- "*"
236+
- "conda-bld/*"
237237

238238
# Requires org-member context
239239
binary_conda_upload:
@@ -248,7 +248,7 @@ jobs:
248248
# Prevent credential from leaking
249249
conda install -yq anaconda-client
250250
set -x
251-
anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload ~/workspace/*.tar.bz2 -u "pytorch-${UPLOAD_CHANNEL}" --label main --no-progress --force
251+
anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload ~/workspace/conda-bld/*/*.tar.bz2 -u "pytorch-${UPLOAD_CHANNEL}" --label main --no-progress --force
252252

253253
# Requires org-member context
254254
binary_wheel_upload:
@@ -284,7 +284,7 @@ jobs:
284284
set -x
285285
source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION}
286286
conda install -v -y -c pytorch-${UPLOAD_CHANNEL} pytorch
287-
conda install -v -y $(ls ~/workspace/torchaudio*.tar.bz2)
287+
conda install -v -y -c file://$HOME/workspace/conda-bld torchaudio
288288
- run:
289289
name: smoke test
290290
command: |

0 commit comments

Comments
 (0)