Merge branch 'website'

.travis.yml

@@ -2,17 +2,25 @@ sudo: false
 language: node_js
 node_js:
   - "9"
-before_script:
-  - npm run build
 cache:
   directories:
-    - packages/react-router/node_modules
-    - packages/react-router-dom/node_modules
-    - packages/react-router-native/node_modules
-    - packages/react-router-config/node_modules
-    - packages/react-router-redux/node_modules
-    - website/node_modules
-branches:
-  only:
-    - master
-    - next
+  - packages/react-router/node_modules
+  - packages/react-router-config/node_modules
+  - packages/react-router-dom/node_modules
+  - packages/react-router-native/node_modules
+  - packages/react-router-redux/node_modules
+  - website/node_modules
+before_script:
+- npm run build
+before_deploy:
+- openssl aes-256-cbc -K $encrypted_70c5e56b421c_key -iv $encrypted_70c5e56b421c_iv
+  -in website_deploy_key.enc -out website_deploy_key -d
+- chmod 600 website_deploy_key
+- eval $(ssh-agent -s)
+- ssh-add website_deploy_key
+deploy:
+  provider: script
+  script: bash scripts/deploy-website.sh
+  skip_cleanup: true
+  on:
+    branch: website

scripts/build.js

@@ -1,10 +1,8 @@
 const execSync = require("child_process").execSync;
 
-const exec = (cmd, env) =>
-  execSync(cmd, {
-    stdio: "inherit",
-    env: Object.assign({}, process.env, env)
-  });
+function exec(cmd, env) {
+  execSync(cmd, { stdio: "inherit", env: process.env });
+}
 
 if (process.env.CI) {
   exec("lerna run build --stream --ignore react-router-website");

scripts/deploy-website.sh

@@ -0,0 +1,20 @@
+tmp_dir=/tmp/reacttraining.com
+
+rm -rf $tmp_dir
+
+git clone --depth 2 --branch master "git@github.com:ReactTraining/reacttraining.com.git" $tmp_dir
+rm -rf "$tmp_dir/public/react-router"
+
+cd website
+
+npm run build -- --output-path "$tmp_dir/public/react-router" --output-public-path "/react-router/"
+
+cd $tmp_dir
+
+git add -A
+git commit \
+  -m "Update react-router website
+
+https://travis-ci.org/$TRAVIS_REPO_SLUG/builds/$TRAVIS_BUILD_ID" \
+  --author "Travis CI <travis@reacttraining.com>"
+git push origin master

scripts/postinstall.js

@@ -1,17 +1,15 @@
 const execSync = require("child_process").execSync;
 
-const exec = (cmd, env) =>
-  execSync(cmd, {
-    stdio: "inherit",
-    env: Object.assign({}, process.env, env)
-  });
+function exec(cmd, env) {
+  execSync(cmd, { stdio: "inherit", env: process.env });
+}
 
-if (process.env.CI) {
+if (process.env.CI && process.env.TRAVIS_BRANCH !== "website") {
   exec(
-    "lerna bootstrap --stream --ignore react-router-website --hoist --nohoist react-native --nohoist react-test-renderer"
+    "lerna bootstrap --stream --hoist --nohoist react-native --nohoist react-test-renderer --ignore react-router-website"
   );
 } else {
   exec(
-    "lerna bootstrap  --stream --hoist --nohoist react-native --nohoist react-test-renderer"
+    "lerna bootstrap --stream --hoist --nohoist react-native --nohoist react-test-renderer"
   );
 }