From 27d669dc9824a3163917b93ee0fe1c3f4253c43a Mon Sep 17 00:00:00 2001
From: Ann Yuan <annyuan@gmail.com>
Date: Fri, 2 Oct 2020 12:29:13 -0400
Subject: [PATCH 01/10] test

---
 scripts/run-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/run-build.sh b/scripts/run-build.sh
index 0c1437ebdee..ea6b87741fa 100755
--- a/scripts/run-build.sh
+++ b/scripts/run-build.sh
@@ -25,5 +25,5 @@ DIR=$1
 # Nightly flow: Run everything.
 if [[ -f "$DIR/run-ci" || $DIR == "e2e" || $NIGHTLY = true ]]; then
   gcloud builds submit . --config=$DIR/cloudbuild.yml \
-    --substitutions _NIGHTLY=$NIGHTLY
+    --substitutions _NIGHTLY=true
 fi

From 3e360193bcb86cc91e4636490339ca94cb956ae6 Mon Sep 17 00:00:00 2001
From: Ann Yuan <annyuan@gmail.com>
Date: Fri, 2 Oct 2020 12:50:30 -0400
Subject: [PATCH 02/10] hbn

---
 scripts/run-build.sh                  |  2 +-
 tfjs-backend-wasm/scripts/build-ci.sh | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/scripts/run-build.sh b/scripts/run-build.sh
index ea6b87741fa..0c1437ebdee 100755
--- a/scripts/run-build.sh
+++ b/scripts/run-build.sh
@@ -25,5 +25,5 @@ DIR=$1
 # Nightly flow: Run everything.
 if [[ -f "$DIR/run-ci" || $DIR == "e2e" || $NIGHTLY = true ]]; then
   gcloud builds submit . --config=$DIR/cloudbuild.yml \
-    --substitutions _NIGHTLY=true
+    --substitutions _NIGHTLY=$NIGHTLY
 fi
diff --git a/tfjs-backend-wasm/scripts/build-ci.sh b/tfjs-backend-wasm/scripts/build-ci.sh
index c154f902d75..7c658457596 100755
--- a/tfjs-backend-wasm/scripts/build-ci.sh
+++ b/tfjs-backend-wasm/scripts/build-ci.sh
@@ -16,6 +16,24 @@
 
 set -e
 
+git clone --depth=1 --single-branch https://github.com/emscripten-core/emsdk.git
+
+cd emsdk
+
+# Install emsdk with up to 1 retry.
+for i in $(seq 0 1)
+do
+  # Wait for 15 seconds then retry.
+  [ $i -gt 0 ] && echo "Retry in 15 seconds, count: $i" && sleep 15
+  # If install is successful, $? will hold 0 and execution will break from the
+  # loop.
+  ./emsdk install 1.39.15 && break
+done
+
+./emsdk activate 1.39.15
+source ./emsdk_env.sh
+cd ..
+
 yarn tsc
 
 ./scripts/build-wasm.sh

From cc47a47cbc02e654adec233ae33b4feb97e8eed3 Mon Sep 17 00:00:00 2001
From: Ann Yuan <annyuan@gmail.com>
Date: Fri, 2 Oct 2020 12:57:30 -0400
Subject: [PATCH 03/10] test

---
 tfjs-backend-wasm/cloudbuild.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tfjs-backend-wasm/cloudbuild.yml b/tfjs-backend-wasm/cloudbuild.yml
index 12ec1c3821a..afc18082e5f 100644
--- a/tfjs-backend-wasm/cloudbuild.yml
+++ b/tfjs-backend-wasm/cloudbuild.yml
@@ -1,12 +1,12 @@
 steps:
 # Install common dependencies.
-- name: 'node:10'
+- name: 'bitnami/node:latest'
   id: 'yarn-common'
   entrypoint: 'yarn'
   args: ['install']
 
 # Install packages.
-- name: 'node:10'
+- name: 'bitnami/node:latest'
   dir: 'tfjs-backend-wasm'
   entrypoint: 'yarn'
   id: 'yarn'
@@ -14,7 +14,7 @@ steps:
   waitFor: ['yarn-common']
 
 # Install build-deps.
-- name: 'node:10'
+- name: 'bitnami/node:latest'
   dir: 'tfjs-backend-wasm'
   entrypoint: 'yarn'
   id: 'build-deps'
@@ -24,13 +24,13 @@ steps:
 # Build.
 - name: 'gcr.io/learnjs-174218/wasm'
   dir: 'tfjs-backend-wasm'
-  entrypoint: 'bash'
+  entrypoint: 'yarn'
   id: 'build'
-  args: ['./scripts/build-ci.sh']
+  args: ['build-ci']
   waitFor: ['yarn', 'build-deps']
 
 # Lint.
-- name: 'node:10'
+- name: 'bitnami/node:latest'
   dir: 'tfjs-backend-wasm'
   entrypoint: 'yarn'
   id: 'lint'
@@ -38,7 +38,7 @@ steps:
   waitFor: ['yarn', 'build-deps']
 
 # Run JS tests.
-- name: 'node:10'
+- name: 'bitnami/node:latest'
   dir: 'tfjs-backend-wasm'
   entrypoint: 'yarn'
   id: 'test-wasm'
@@ -64,7 +64,7 @@ steps:
   waitFor: ['yarn', 'build-deps', 'build']
 
 # Lint bazel files.
-- name: 'node:10'
+- name: 'bitnami/node:latest'
   dir: 'tfjs-backend-wasm'
   id: 'buildifier'
   entrypoint: 'yarn'

From 8db36e0d358e07e185ccd90b45d20c353540af6e Mon Sep 17 00:00:00 2001
From: Ann Yuan <annyuan@gmail.com>
Date: Fri, 2 Oct 2020 13:04:40 -0400
Subject: [PATCH 04/10] clean

---
 tfjs-backend-wasm/cloudbuild.yml      | 16 ++++++++--------
 tfjs-backend-wasm/scripts/build-ci.sh |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tfjs-backend-wasm/cloudbuild.yml b/tfjs-backend-wasm/cloudbuild.yml
index afc18082e5f..12ec1c3821a 100644
--- a/tfjs-backend-wasm/cloudbuild.yml
+++ b/tfjs-backend-wasm/cloudbuild.yml
@@ -1,12 +1,12 @@
 steps:
 # Install common dependencies.
-- name: 'bitnami/node:latest'
+- name: 'node:10'
   id: 'yarn-common'
   entrypoint: 'yarn'
   args: ['install']
 
 # Install packages.
-- name: 'bitnami/node:latest'
+- name: 'node:10'
   dir: 'tfjs-backend-wasm'
   entrypoint: 'yarn'
   id: 'yarn'
@@ -14,7 +14,7 @@ steps:
   waitFor: ['yarn-common']
 
 # Install build-deps.
-- name: 'bitnami/node:latest'
+- name: 'node:10'
   dir: 'tfjs-backend-wasm'
   entrypoint: 'yarn'
   id: 'build-deps'
@@ -24,13 +24,13 @@ steps:
 # Build.
 - name: 'gcr.io/learnjs-174218/wasm'
   dir: 'tfjs-backend-wasm'
-  entrypoint: 'yarn'
+  entrypoint: 'bash'
   id: 'build'
-  args: ['build-ci']
+  args: ['./scripts/build-ci.sh']
   waitFor: ['yarn', 'build-deps']
 
 # Lint.
-- name: 'bitnami/node:latest'
+- name: 'node:10'
   dir: 'tfjs-backend-wasm'
   entrypoint: 'yarn'
   id: 'lint'
@@ -38,7 +38,7 @@ steps:
   waitFor: ['yarn', 'build-deps']
 
 # Run JS tests.
-- name: 'bitnami/node:latest'
+- name: 'node:10'
   dir: 'tfjs-backend-wasm'
   entrypoint: 'yarn'
   id: 'test-wasm'
@@ -64,7 +64,7 @@ steps:
   waitFor: ['yarn', 'build-deps', 'build']
 
 # Lint bazel files.
-- name: 'bitnami/node:latest'
+- name: 'node:10'
   dir: 'tfjs-backend-wasm'
   id: 'buildifier'
   entrypoint: 'yarn'
diff --git a/tfjs-backend-wasm/scripts/build-ci.sh b/tfjs-backend-wasm/scripts/build-ci.sh
index 7c658457596..6b9474d1005 100755
--- a/tfjs-backend-wasm/scripts/build-ci.sh
+++ b/tfjs-backend-wasm/scripts/build-ci.sh
@@ -16,6 +16,8 @@
 
 set -e
 
+yarn clean
+
 git clone --depth=1 --single-branch https://github.com/emscripten-core/emsdk.git
 
 cd emsdk

From eb50b24a654ab28ef9f486b4937c40e22ff6dc32 Mon Sep 17 00:00:00 2001
From: Ann Yuan <annyuan@gmail.com>
Date: Fri, 2 Oct 2020 13:25:26 -0400
Subject: [PATCH 05/10] hbn

---
 tfjs-backend-wasm/WORKSPACE | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tfjs-backend-wasm/WORKSPACE b/tfjs-backend-wasm/WORKSPACE
index c1cefbef0bd..4abc19189dc 100644
--- a/tfjs-backend-wasm/WORKSPACE
+++ b/tfjs-backend-wasm/WORKSPACE
@@ -89,6 +89,7 @@ git_repository(
 
 http_archive(
     name = "rules_cc",
-    strip_prefix = "rules_cc-master",
-    urls = ["https://github.com/bazelbuild/rules_cc/archive/master.zip"],
+    strip_prefix = "rules_cc-8346df34b6593b051403b8e429db15c7f4ead937",
+    sha256 = "8346df34b6593b051403b8e429db15c7f4ead937",
+    urls = ["https://github.com/bazelbuild/rules_cc/archive/8346df34b6593b051403b8e429db15c7f4ead937.zip"]
 )

From acedad2d3c67a10252a70389dff1e76ee4099fd0 Mon Sep 17 00:00:00 2001
From: Ann Yuan <annyuan@gmail.com>
Date: Fri, 2 Oct 2020 13:29:38 -0400
Subject: [PATCH 06/10] reorder

---
 tfjs-backend-wasm/WORKSPACE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tfjs-backend-wasm/WORKSPACE b/tfjs-backend-wasm/WORKSPACE
index 4abc19189dc..43d5b3e29fa 100644
--- a/tfjs-backend-wasm/WORKSPACE
+++ b/tfjs-backend-wasm/WORKSPACE
@@ -89,7 +89,7 @@ git_repository(
 
 http_archive(
     name = "rules_cc",
-    strip_prefix = "rules_cc-8346df34b6593b051403b8e429db15c7f4ead937",
     sha256 = "8346df34b6593b051403b8e429db15c7f4ead937",
+    strip_prefix = "rules_cc-8346df34b6593b051403b8e429db15c7f4ead937",
     urls = ["https://github.com/bazelbuild/rules_cc/archive/8346df34b6593b051403b8e429db15c7f4ead937.zip"]
 )

From 51edde656f2ad6cbe99a79064648a0397ab25ce1 Mon Sep 17 00:00:00 2001
From: Ann Yuan <annyuan@gmail.com>
Date: Fri, 2 Oct 2020 13:39:20 -0400
Subject: [PATCH 07/10] hbn

---
 tfjs-backend-wasm/WORKSPACE | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tfjs-backend-wasm/WORKSPACE b/tfjs-backend-wasm/WORKSPACE
index 43d5b3e29fa..b0a8d2342dc 100644
--- a/tfjs-backend-wasm/WORKSPACE
+++ b/tfjs-backend-wasm/WORKSPACE
@@ -89,7 +89,9 @@ git_repository(
 
 http_archive(
     name = "rules_cc",
-    sha256 = "8346df34b6593b051403b8e429db15c7f4ead937",
-    strip_prefix = "rules_cc-8346df34b6593b051403b8e429db15c7f4ead937",
-    urls = ["https://github.com/bazelbuild/rules_cc/archive/8346df34b6593b051403b8e429db15c7f4ead937.zip"]
+    sha256 = "90d5a66950b492cbf86201cdc49c4b59796a85a4eb9fd63c07afe5f7132ea623",
+    strip_prefix = "psimd-8346df34b6593b051403b8e429db15c7f4ead937",
+    urls = [
+        "https://github.com/bazelbuild/rules_cc/archive/8346df34b6593b051403b8e429db15c7f4ead937.zip",
+    ],
 )

From 1137f42a2cbe27ce15def9934d9ab07318a4bf8f Mon Sep 17 00:00:00 2001
From: Ann Yuan <annyuan@gmail.com>
Date: Fri, 2 Oct 2020 13:46:43 -0400
Subject: [PATCH 08/10] oops

---
 tfjs-backend-wasm/WORKSPACE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tfjs-backend-wasm/WORKSPACE b/tfjs-backend-wasm/WORKSPACE
index b0a8d2342dc..14d962615ea 100644
--- a/tfjs-backend-wasm/WORKSPACE
+++ b/tfjs-backend-wasm/WORKSPACE
@@ -90,7 +90,7 @@ git_repository(
 http_archive(
     name = "rules_cc",
     sha256 = "90d5a66950b492cbf86201cdc49c4b59796a85a4eb9fd63c07afe5f7132ea623",
-    strip_prefix = "psimd-8346df34b6593b051403b8e429db15c7f4ead937",
+    strip_prefix = "rules_cc-8346df34b6593b051403b8e429db15c7f4ead937",
     urls = [
         "https://github.com/bazelbuild/rules_cc/archive/8346df34b6593b051403b8e429db15c7f4ead937.zip",
     ],

From 5599dc95564196baf0e2ea4425f089f73f6bfab2 Mon Sep 17 00:00:00 2001
From: Ann Yuan <annyuan@gmail.com>
Date: Fri, 2 Oct 2020 13:53:27 -0400
Subject: [PATCH 09/10] add

---
 tfjs-backend-wasm/scripts/build-ci.sh | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/tfjs-backend-wasm/scripts/build-ci.sh b/tfjs-backend-wasm/scripts/build-ci.sh
index 6b9474d1005..c154f902d75 100755
--- a/tfjs-backend-wasm/scripts/build-ci.sh
+++ b/tfjs-backend-wasm/scripts/build-ci.sh
@@ -16,26 +16,6 @@
 
 set -e
 
-yarn clean
-
-git clone --depth=1 --single-branch https://github.com/emscripten-core/emsdk.git
-
-cd emsdk
-
-# Install emsdk with up to 1 retry.
-for i in $(seq 0 1)
-do
-  # Wait for 15 seconds then retry.
-  [ $i -gt 0 ] && echo "Retry in 15 seconds, count: $i" && sleep 15
-  # If install is successful, $? will hold 0 and execution will break from the
-  # loop.
-  ./emsdk install 1.39.15 && break
-done
-
-./emsdk activate 1.39.15
-source ./emsdk_env.sh
-cd ..
-
 yarn tsc
 
 ./scripts/build-wasm.sh

From 382893f7fbc3d56cf2e43b26bbdc46da42378f05 Mon Sep 17 00:00:00 2001
From: Ann Yuan <annyuan@gmail.com>
Date: Fri, 2 Oct 2020 14:19:23 -0400
Subject: [PATCH 10/10] fix

---
 tfjs-backend-wasm/cloudbuild.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tfjs-backend-wasm/cloudbuild.yml b/tfjs-backend-wasm/cloudbuild.yml
index 12ec1c3821a..67bc4af199f 100644
--- a/tfjs-backend-wasm/cloudbuild.yml
+++ b/tfjs-backend-wasm/cloudbuild.yml
@@ -56,12 +56,13 @@ steps:
   waitFor: ['build']
 
 # Check bundle size.
-- name: 'gcr.io/learnjs-174218/wasm'
-  dir: 'tfjs-backend-wasm'
-  id: 'test-bundle-size'
-  entrypoint: 'yarn'
-  args: ['test-bundle-size']
-  waitFor: ['yarn', 'build-deps', 'build']
+# TODO(annxingyuan): Reenable once https://github.com/tensorflow/tfjs/pull/4012 is merged.
+# - name: 'gcr.io/learnjs-174218/wasm'
+#   dir: 'tfjs-backend-wasm'
+#   id: 'test-bundle-size'
+#   entrypoint: 'yarn'
+#   args: ['test-bundle-size']
+#   waitFor: ['yarn', 'build-deps', 'build']
 
 # Lint bazel files.
 - name: 'node:10'