Skip to content

Commit

Permalink
Merge pull request #564 from AugurProject/linting
Browse files Browse the repository at this point in the history
Add linting to CI explicitly and fix current lint problem
  • Loading branch information
nuevoalex committed Feb 27, 2018
2 parents 3dc92ef + 91eed23 commit c5597b8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"test": "test"
},
"scripts": {
"lint": "npx solium --dir . --reporter=gcc",
"lint": "npx solium --dir source --reporter=gcc",
"build:source": "npx tsc",
"build:contracts": "node output/deployment/compileContracts.js",
"build:interfaces": "node output/tools/generateContractInterfaces.js",
Expand Down
2 changes: 1 addition & 1 deletion source/contracts/reporting/Universe.sol
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ contract Universe is DelegationTarget, Extractable, ITyped, Initializable, IUniv
.mul(_previousValue
.mul(_badMarkets)
.div(_totalMarkets)
.sub(_previousValue / _targetDivisor));
.sub(_previousValue / _targetDivisor));
_newValue = _newValue / (_targetDivisor - 1);
_newValue = _newValue.add(_previousValue);
}
Expand Down
4 changes: 4 additions & 0 deletions source/support/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RUN pip install --upgrade pip setuptools \

# Install basics of the application
COPY .soliumrc.json /app/.soliumrc.json
COPY .soliumignore /app/.soliumignore
COPY tsconfig.json /app/tsconfig.json
COPY typings/ /app/typings/
COPY source/contracts/ /app/source/contracts/
Expand All @@ -34,6 +35,9 @@ COPY package.json /app/package.json

RUN npm install

# Lint
RUN npm run lint

# Build first chunk
RUN npm run build:source
RUN npm run build:contracts
Expand Down

0 comments on commit c5597b8

Please sign in to comment.