From 8f715ece4d26aa420f7f0b3c8c5e14e2bfaad5bf Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 21 Feb 2019 18:20:51 +0200
Subject: [PATCH] ci: make yarn globally available and independent of
 `$BASH_ENV`

Previously, our yarn (which overwrote the pre-installed yarn on the
docker image) was only available through `$BASH_ENV` (as an exported
function). This caused it to be undefined for commands executed in other
shells (e.g. via Node.js' `child_process.spawn()` unless explicitly
configuring it to run with `bash`).

This commit fixes this by making our yarn version available globally via
a symlink (`/usr/local/bin/yarn`).

(This was accidentally broken in #28839.)
---
 .circleci/config.yml | 12 ++++++------
 .circleci/env.sh     |  7 -------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1980c326710ca..35cfdbe306d3b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,11 +31,13 @@ var_3: &cache_key v2-angular-node-10.12-{{ checksum "yarn.lock" }}-{{ checksum "
 # Initializes the CI environment by setting up common environment variables.
 var_4: &init_environment
   run:
-    name: Initializing environment (setting up variables, removing Yarn)
-    # Remove the yarn installed in the docker container; we want our own version
+    name: Initializing environment (setting up variables, overwriting Yarn)
+    # Overwrite the yarn installed in the docker container with our own version.
     command: |
-      sudo rm /usr/local/bin/yarn
-      source ./.circleci/env.sh
+      ./.circleci/env.sh
+      ourYarn=$(realpath ./third_party/github.com/yarnpkg/yarn/releases/download/v1.13.0/bin/yarn.js)
+      sudo chmod a+x $ourYarn
+      sudo ln -fs $ourYarn /usr/local/bin/yarn
       echo "Yarn version: $(yarn --version)"
 
 var_5: &setup_bazel_remote_execution
@@ -107,8 +109,6 @@ jobs:
       - run: 'yarn bazel:lint ||
               (echo -e "\n.bzl files have lint errors. Please run ''yarn bazel:lint-fix''"; exit 1)'
 
-      # Use `yarn gulp ...` (instead of `node_modules/.bin/gulp ...`) to ensure that yarn
-      # (which is an exported bash function) will be available to processes spawned by gulp.
       - run: yarn gulp lint
 
   test:
diff --git a/.circleci/env.sh b/.circleci/env.sh
index ea8772a03b764..d882e494e75c5 100755
--- a/.circleci/env.sh
+++ b/.circleci/env.sh
@@ -62,12 +62,5 @@ setPublicVar SAUCE_TUNNEL_IDENTIFIER "angular-${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_
 setPublicVar SAUCE_READY_FILE_TIMEOUT 120
 
 
-####################################################################################################
-# Define our own yarn command for CircleCI.
-####################################################################################################
-echo "function yarn () { /usr/bin/env node $projectDir/third_party/github.com/yarnpkg/yarn/releases/download/v1.13.0/bin/yarn.js \"\$@\"; }" >> $BASH_ENV;
-echo "export -f yarn;" >> $BASH_ENV;
-
-
 # Source `$BASH_ENV` to make the variables available immediately.
 source $BASH_ENV;