Skip to content

Commit

Permalink
Fix broken build
Browse files Browse the repository at this point in the history
  • Loading branch information
mjackson committed Dec 3, 2018
1 parent ca56917 commit 447394f
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 1,683 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.travis.yml
package.json
package-lock.json
58 changes: 32 additions & 26 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,39 @@ language: node_js
node_js: node
cache:
directories:
- packages/react-router/node_modules
- packages/react-router-config/node_modules
- packages/react-router-dom/node_modules
- packages/react-router-native/node_modules
- website/node_modules
- packages/react-router/node_modules
- packages/react-router-config/node_modules
- packages/react-router-dom/node_modules
- packages/react-router-native/node_modules
- website/node_modules
env:
- TEST_ENV=cjs BUILD_ENV=cjs
- TEST_ENV=umd BUILD_ENV=umd
- TEST_ENV=source
- TEST_ENV=cjs BUILD_ENV=cjs
- TEST_ENV=umd BUILD_ENV=umd
- TEST_ENV=source
before_script:
- ([[ -z "$BUILD_ENV" ]] || npm run build -- --no-website)
# react-router ESM build is imported by react-router-dom UMD,
# so we need to build it before building react-router-dom UMD
- ([[ "$BUILD_ENV" != "umd" ]] || (cd packages/react-router && BUILD_ENV=esm npm run build))
- ([[ -z "$BUILD_ENV" ]] || npm run build -- --no-website)
# react-router CJS build is imported by react-router-config tests,
# so we need to build it before running react-router-config tests
- ([[ "$BUILD_ENV" = "cjs" ]] || (cd packages/react-router && BUILD_ENV=cjs npm run build))
jobs:
include:
- stage: Deploy Website
if: branch = website
env: PUBLIC_PATH=/react-router/
before_script: npm run build
script: echo "Deploying website to https://reacttraining.com$PUBLIC_PATH"
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
- stage: Deploy Website
if: branch = website
env: PUBLIC_PATH=/react-router/
before_script: npm run build -- --no-website
script: echo "Deploying website to https://reacttraining.com$PUBLIC_PATH"
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"private": true,
"scripts": {
"postinstall": "node ./scripts/postinstall.js",
"build": "node ./scripts/build.js",
"clean": "git clean -fdX .",
"postinstall": "node ./scripts/postinstall.js",
"start": "node ./scripts/start.js",
"test": "node ./scripts/test.js"
},
Expand Down
Loading

0 comments on commit 447394f

Please sign in to comment.