Fix missing env for update_binary_size job

Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/20645

Differential Revision: D15400130

Pulled By: pjh5

fbshipit-source-id: d2a07fc5608ab3a96026b60e16bd12add8e0c9d4

.circleci/config.yml

@@ -1430,11 +1430,6 @@ jobs:
         <<: *setup_linux_system_environment
     - run:
         <<: *binary_checkout
-    # N.B. This sources binary_populate_env so that it takes the Pytorch
-    # version listed there. The only variables it needs are the date and the
-    # version string.
-    - run:
-        <<: *binary_populate_env
     - run:
         <<: *binary_install_miniconda
     - run:
@@ -1442,13 +1437,18 @@ jobs:
         no_output_timeout: "1h"
         command: |
           set +x
-          echo "declare -x \"AWS_ACCESS_KEY_ID=${PYTORCH_BINARY_AWS_ACCESS_KEY_ID}\"" >> /home/circleci/project/env
+          echo "declare -x \"AWS_ACCESS_KEY_ID=${PYTORCH_BINARY_AWS_ACCESS_KEY_ID}\"" > /home/circleci/project/env
           echo "declare -x \"AWS_SECRET_ACCESS_KEY=${PYTORCH_BINARY_AWS_SECRET_ACCESS_KEY}\"" >> /home/circleci/project/env
+          export DATE="$(date -u +%Y_%m_%d)"
+          retry () {
+              $*  || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
+          }
           source /home/circleci/project/env
           set -eux -o pipefail
 
+          # This is hardcoded to match binary_install_miniconda.sh
+          export PATH="/home/circleci/project/miniconda/bin:$PATH"
           # Not any awscli will work. Most won't. This one will work
-          export PATH="$MINICONDA_ROOT/bin:$PATH"
           retry conda create -qyn aws36 python=3.6
           source activate aws36
           pip install awscli==1.16.46

.circleci/scripts/binary_install_miniconda.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eux -o pipefail
+
 # This step runs on multiple executors with different envfile locations
 if [[ "$(uname)" == Darwin ]]; then
   source "/Users/distiller/project/env"
@@ -12,6 +13,21 @@ else
   source "/env"
 fi
 
+# MINICONDA_ROOT is populated in binary_populate_env.sh , but update_htmls does
+# not source that script since it does not have a BUILD_ENVIRONMENT. It could
+# make a fake BUILD_ENVIRONMENT and call that script anyway, but that seems
+# more hacky than this
+if [[ -z "${MINICONDA_ROOT:-}" ]]; then
+  # TODO get rid of this. Might need to separate binary_populate_env into two
+  # steps, one for every job and one for build jobs
+  MINICONDA_ROOT="/home/circleci/project/miniconda"
+  workdir="/home/circleci/project"
+  retry () {
+      $*  || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
+  }
+  export -f retry
+fi
+
 conda_sh="$workdir/install_miniconda.sh"
 if [[ "$(uname)" == Darwin ]]; then
   retry curl -o "$conda_sh" https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh

.circleci/verbatim-sources/binary_update_htmls.yml

@@ -71,11 +71,6 @@
         <<: *setup_linux_system_environment
     - run:
         <<: *binary_checkout
-    # N.B. This sources binary_populate_env so that it takes the Pytorch
-    # version listed there. The only variables it needs are the date and the
-    # version string.
-    - run:
-        <<: *binary_populate_env
     - run:
         <<: *binary_install_miniconda
     - run:
@@ -83,13 +78,18 @@
         no_output_timeout: "1h"
         command: |
           set +x
-          echo "declare -x \"AWS_ACCESS_KEY_ID=${PYTORCH_BINARY_AWS_ACCESS_KEY_ID}\"" >> /home/circleci/project/env
+          echo "declare -x \"AWS_ACCESS_KEY_ID=${PYTORCH_BINARY_AWS_ACCESS_KEY_ID}\"" > /home/circleci/project/env
           echo "declare -x \"AWS_SECRET_ACCESS_KEY=${PYTORCH_BINARY_AWS_SECRET_ACCESS_KEY}\"" >> /home/circleci/project/env
+          export DATE="$(date -u +%Y_%m_%d)"
+          retry () {
+              $*  || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
+          }
           source /home/circleci/project/env
           set -eux -o pipefail
 
+          # This is hardcoded to match binary_install_miniconda.sh
+          export PATH="/home/circleci/project/miniconda/bin:$PATH"
           # Not any awscli will work. Most won't. This one will work
-          export PATH="$MINICONDA_ROOT/bin:$PATH"
           retry conda create -qyn aws36 python=3.6
           source activate aws36
           pip install awscli==1.16.46