Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Refactor for clarification and remove unneeded code #717

Merged
merged 1 commit into from
Feb 5, 2016
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
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@ node_js:
- 5.5.0
install:
- npm install
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sleep 3 # give xvfb some time to start
script:
- npm test
- webpack --bail --progress --build --tc
- npm run build
sudo: false
deploy:
- provider: s3
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "topcoder-app",
"description": "Topcoder pages including login, registration, settings, dashboard, profile.",
"scripts": {
"build": "webpack --bail --progress --build",
"build": "webpack --bail --progress --build --tc",
"dev": "webpack-dev-server --history-api-fallback --dev --tc --inline --progress --port 3000",
"lint": "eslint .",
"test": "karma start --tc --test"
Expand Down
7 changes: 3 additions & 4 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
require('./node_modules/coffee-script/register')

if (process.env.TRAVIS_BRANCH == 'master') process.env.ENV = 'PROD'
else if (process.env.TRAVIS_BRANCH == 'qa-integration') process.env.ENV = 'QA'
else if (process.env.TRAVIS_BRANCH == 'dev') process.env.ENV = 'DEV'
else process.env.ENV = 'DEV'
if (process.env.TRAVIS_BRANCH == 'master') process.env.ENV = 'PROD'
if (process.env.TRAVIS_BRANCH == 'qa-integration') process.env.ENV = 'QA'
if (process.env.TRAVIS_BRANCH == 'dev') process.env.ENV = 'DEV'

var config = require('appirio-tech-webpack-config')({
dirname: __dirname,
Expand Down