From 0077b11da2816b633502f2614cac1f9d5b297dae Mon Sep 17 00:00:00 2001
From: Justin Poehnelt <jpoehnelt@google.com>
Date: Thu, 12 Dec 2019 15:39:09 -0700
Subject: [PATCH] fix: copy to master/public

---
 .travis.sh    |  7 ++++++-
 .travis.yml   | 10 ++--------
 firebase.json |  2 +-
 package.json  |  4 ++--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index 151af120f9..32ce1a7ce9 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -5,5 +5,10 @@ set -euo pipefail
 if [ "$TRAVIS_BRANCH" != "master" ]; then 
     yarn run build;
     yarn run test; 
-    yarn run deploy:extract;
+
+    yarn run deploy:public;
+
+    cp .travis.yml master/.travis.yml
+    cp .travis.sh master/.travis.sh
+    cp README.md master/README.md
 fi
diff --git a/.travis.yml b/.travis.yml
index b998fb93d3..eb3b79de95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,6 @@ cache:
   - ".cache/bazel-disk-cache"
 script:
   - ./.travis.sh
-before_deploy: # this is to mirror the public folder only
-  - mkdir -p master
-  - cp -r public/ master/public/
-  - cp .travis.yml master/.travis.yml
-  - cp .travis.sh master/.travis.sh
-  - cp README.md master/README.md
 deploy:
 - provider: script
   skip_cleanup: true
@@ -34,7 +28,7 @@ deploy:
   secret_access_key: "$GCS_SECRET"
   bucket: js-samples
   skip_cleanup: true
-  local_dir: public
+  local_dir: master/public
   upload_dir: "$TRAVIS_COMMIT"
   cache_control: max-age=31536000
   edge:
@@ -52,7 +46,7 @@ deploy:
     source: jpoehnelt/dpl
     branch: feat/gcs_parallel
   acl: public-read
-  local_dir: public
+  local_dir: master/public
   upload_dir: "$TRAVIS_TAG"
   cache_control: max-age=31536000
   on:
diff --git a/firebase.json b/firebase.json
index ce748f49b9..d600df9948 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1,6 +1,6 @@
 {
   "hosting": {
-    "public": "public",
+    "public": "master/public",
     "ignore": [
       "firebase.json",
       "**/.*",
diff --git a/package.json b/package.json
index e8f99ba9c0..bf6e48555d 100644
--- a/package.json
+++ b/package.json
@@ -25,12 +25,12 @@
     "defaults:package:merge": "lerna exec '../../build/merge_default_package.sh'",
     "deploy": "firebase deploy",
     "deploy:ci": "firebase deploy --token $FIREBASE_TOKEN",
-    "deploy:extract": "mkdir -p public && rm -rf public/* && tar -xf dist/bin/public.tar -C public",
+    "deploy:public": "mkdir -p master/public && tar -xf dist/bin/public.tar -C master/public",
     "format": "yarn run format:root && lerna run format",
     "format:dist": "lerna run format:dist",
     "format:root": "sort-package-json && prettier *.json *.js shared/**/*.scss --write --loglevel error",
     "serve": "bazel run :serve",
-    "serve:firebase": "yarn run build && yarn run deploy:extract && firebase serve",
+    "serve:firebase": "yarn run build && yarn run deploy:public && firebase serve",
     "test": "lerna run test && yarn run test:tags && bazel test //...",
     "test:tags": "./build/test_tags.sh"
   },