Skip to content

Commit

Permalink
feat: Fall back from Makefile to NPM in build and test jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
edahlseng committed Jul 29, 2019
1 parent c1f3f9f commit e8d5a6e
Showing 1 changed file with 26 additions and 2 deletions.
28 changes: 26 additions & 2 deletions sources/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,19 @@ jobs:
- get-workspace
- run:
name: Building
command: make build
command: |
if which make && [[ -e Makefile ]]; then
make build
exit 0
fi
if which npm [[ -e package.json ]]; then
npm run build
exit 0
fi
echo "Unable to find a command runner"
exit 1
- put-directory:
path: .
install-dependencies-npm:
Expand Down Expand Up @@ -389,7 +401,19 @@ jobs:
- get-workspace
- run:
name: Running tests
command: make test-report
command: |
if which make && [[ -e Makefile ]]; then
make test-report
exit 0
fi
if which npm [[ -e package.json ]]; then
npm run test-report
exit 0
fi
echo "Unable to find a command runner"
exit 1
- put-test-results:
path: ./test-results
- store_artifacts:
Expand Down

0 comments on commit e8d5a6e

Please sign in to comment.