From 257c4f63998c3096a821e6fef36b9df7db0bf1f4 Mon Sep 17 00:00:00 2001 From: moto <855818+mthrok@users.noreply.github.com> Date: Thu, 28 May 2020 21:56:17 +0000 Subject: [PATCH 1/2] Install conda package from workspace --- .circleci/config.yml | 17 ++++++++--------- .circleci/config.yml.in | 17 ++++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 646ae75df6..de3d5676f6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,9 +80,9 @@ jobs: - store_artifacts: path: /opt/conda/conda-bld/linux-64 - persist_to_workspace: - root: /opt/conda/conda-bld/linux-64 + root: /opt/conda paths: - - "*" + - "conda-bld/*" binary_windows_wheel: <<: *binary_common @@ -120,9 +120,9 @@ jobs: - store_artifacts: path: C:/tools/miniconda3/conda-bld/win-64 - persist_to_workspace: - root: C:/tools/miniconda3/conda-bld/win-64 + root: C:/tools/miniconda3 paths: - - "*" + - "conda-bld/*" binary_macos_wheel: <<: *binary_common @@ -165,9 +165,9 @@ jobs: - store_artifacts: path: /Users/distiller/miniconda3/conda-bld/osx-64 - persist_to_workspace: - root: /Users/distiller/miniconda3/conda-bld/osx-64 + root: /Users/distiller/miniconda3 paths: - - "*" + - "conda-bld/*" # Requires org-member context binary_conda_upload: @@ -181,7 +181,7 @@ jobs: # Prevent credential from leaking conda install -yq anaconda-client set -x - anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload ~/workspace/*.tar.bz2 -u pytorch-nightly --label main --no-progress --force + anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload ~/workspace/conda-bld/*/*.tar.bz2 -u pytorch-nightly --label main --no-progress --force # Requires org-member context binary_wheel_upload: @@ -214,8 +214,7 @@ jobs: command: | set -x source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION} - conda install -v -y -c pytorch-nightly pytorch - conda install -v -y $(ls ~/workspace/torchtext*.tar.bz2) + conda install -v -y -c pytorch-nightly pytorch file://$HOME/workspace/conda-bld - run: name: smoke test command: | diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index b7506a531f..9f960c077a 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -80,9 +80,9 @@ jobs: - store_artifacts: path: /opt/conda/conda-bld/linux-64 - persist_to_workspace: - root: /opt/conda/conda-bld/linux-64 + root: /opt/conda paths: - - "*" + - "conda-bld/*" binary_windows_wheel: <<: *binary_common @@ -120,9 +120,9 @@ jobs: - store_artifacts: path: C:/tools/miniconda3/conda-bld/win-64 - persist_to_workspace: - root: C:/tools/miniconda3/conda-bld/win-64 + root: C:/tools/miniconda3 paths: - - "*" + - "conda-bld/*" binary_macos_wheel: <<: *binary_common @@ -165,9 +165,9 @@ jobs: - store_artifacts: path: /Users/distiller/miniconda3/conda-bld/osx-64 - persist_to_workspace: - root: /Users/distiller/miniconda3/conda-bld/osx-64 + root: /Users/distiller/miniconda3 paths: - - "*" + - "conda-bld/*" # Requires org-member context binary_conda_upload: @@ -181,7 +181,7 @@ jobs: # Prevent credential from leaking conda install -yq anaconda-client set -x - anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload ~/workspace/*.tar.bz2 -u pytorch-nightly --label main --no-progress --force + anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload ~/workspace/conda-bld/*/*.tar.bz2 -u pytorch-nightly --label main --no-progress --force # Requires org-member context binary_wheel_upload: @@ -214,8 +214,7 @@ jobs: command: | set -x source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION} - conda install -v -y -c pytorch-nightly pytorch - conda install -v -y $(ls ~/workspace/torchtext*.tar.bz2) + conda install -v -y -c pytorch-nightly pytorch file://$HOME/workspace/conda-bld - run: name: smoke test command: | From 688fe0924757060b9048a99672d2c2503ccffbb7 Mon Sep 17 00:00:00 2001 From: moto <855818+mthrok@users.noreply.github.com> Date: Thu, 28 May 2020 23:35:03 +0000 Subject: [PATCH 2/2] Update torchtext installation --- .circleci/config.yml | 3 ++- .circleci/config.yml.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index de3d5676f6..165f641de7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -214,7 +214,8 @@ jobs: command: | set -x source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION} - conda install -v -y -c pytorch-nightly pytorch file://$HOME/workspace/conda-bld + conda install -v -y -c pytorch-nightly pytorch + conda install -v -y -c file://$HOME/workspace/conda-bld torchtext - run: name: smoke test command: | diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 9f960c077a..acd233d450 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -214,7 +214,8 @@ jobs: command: | set -x source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION} - conda install -v -y -c pytorch-nightly pytorch file://$HOME/workspace/conda-bld + conda install -v -y -c pytorch-nightly pytorch + conda install -v -y -c file://$HOME/workspace/conda-bld torchtext - run: name: smoke test command: |