Skip to content

Commit d6f9852

Browse files
committed
Attempt 2 at build stages on travis
1 parent 4b07f60 commit d6f9852

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ before_install:
1212

1313
jobs:
1414
- stage: Tests
15-
script: docker exec fidimag make test-basic
15+
script: make test-docker
1616
- stage: Notebooks
17-
script:
18-
- while sleep 9m; do echo "===[ $SECONDS seconds still running ]===\n"; done &
19-
- docker exec fidimag make test-ipynb
20-
- kill %1
17+
script: make ipynb-docker
2118

2219
notifications:
2320
email:

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,17 @@ docker:
2323
# Tests #
2424
#########
2525

26-
test-docker: docker
26+
test-docker:
2727
docker exec fidimag make test-basic
2828
#docker exec fidimag make test-without-run-oommf
2929
#docker exec fidimag make test-ipynb
3030

31-
travis: test-docker
31+
ipynb-docker:
32+
while sleep 9m; do echo "===[ Still Running ]===\n"; done &
33+
docker exec fidimag make test-ipynb
34+
kill %1
35+
36+
travis-test: test-docker
3237
docker exec fidimag make codecov
3338
docker exec fidimag make test-ipynb
3439

0 commit comments

Comments
 (0)