Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 2 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion firebase.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"hosting": {
"public": "public",
"public": "master/public",
"ignore": [
"firebase.json",
"**/.*",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down