Martin Blanchard pushed to branch mablanch/00-update-fix-ci at BuildGrid / buildgrid
Commits:
- 
e7457f34
by Martin Blanchard at 2018-09-06T12:15:29Z
 
1 changed file:
Changes:
| ... | ... | @@ -40,8 +40,11 @@ run-dummy-job-debian: | 
| 40 | 40 | 
   image: buildstream/buildstream-debian
 | 
| 41 | 41 | 
   <<: *dummy-job
 | 
| 42 | 42 | 
 | 
| 43 | 
-build-docs:
 | 
|
| 44 | 
-  stage: test
 | 
|
| 43 | 
+  | 
|
| 44 | 
+documentation:
 | 
|
| 45 | 
+  stage: post
 | 
|
| 46 | 
+  dependencies:
 | 
|
| 47 | 
+  - tests-debian-stretch
 | 
|
| 45 | 48 | 
   script:
 | 
| 46 | 49 | 
     - python3 -m pip install --user --editable ".[docs]"
 | 
| 47 | 50 | 
     - make -C docs html
 | 
| ... | ... | @@ -51,33 +54,33 @@ build-docs: | 
| 51 | 54 | 
     paths:
 | 
| 52 | 55 | 
     - documentation/
 | 
| 53 | 56 | 
 | 
| 54 | 
-  | 
|
| 55 | 57 | 
 coverage:
 | 
| 56 | 58 | 
   stage: post
 | 
| 59 | 
+  dependencies:
 | 
|
| 60 | 
+  - tests-debian-stretch
 | 
|
| 57 | 61 | 
   coverage: '/TOTAL +\d+ +\d+ +(\d+\.\d+)%/'
 | 
| 58 | 62 | 
   script:
 | 
| 59 | 63 | 
     - python3 -m pip install --user --editable ".[tests]"
 | 
| 60 | 
-    - mkdir report
 | 
|
| 61 | 
-    - cd report
 | 
|
| 62 | 
-    - cp ../coverage/coverage.* .
 | 
|
| 63 | 
-    - ls coverage.*
 | 
|
| 64 | 
-    - coverage combine --rcfile=../.coveragerc -a coverage.*
 | 
|
| 65 | 
-    - coverage report --rcfile=../.coveragerc -m
 | 
|
| 66 | 
-  dependencies:
 | 
|
| 67 | 
-  - tests-debian-stretch
 | 
|
| 64 | 
+    - cd coverage/
 | 
|
| 65 | 
+    - ls -l .
 | 
|
| 66 | 
+    - python3 -m coverage combine --rcfile=../.coveragerc --append coverage.*
 | 
|
| 67 | 
+    - python3 -m coverage html --rcfile=../.coveragerc --directory coverage/
 | 
|
| 68 | 
+    - python3 -m coverage report --rcfile=../.coveragerc --show-missing
 | 
|
| 69 | 
+    - python3 -m coverage erase --rcfile=../.coveragerc
 | 
|
| 70 | 
+  artifacts:
 | 
|
| 71 | 
+    paths:
 | 
|
| 72 | 
+    - coverage/
 | 
|
| 68 | 73 | 
 | 
| 69 | 74 | 
 # Deploy, only for merges which land on master branch.
 | 
| 70 | 75 | 
 #
 | 
| 71 | 76 | 
 pages:
 | 
| 72 | 77 | 
   stage: post
 | 
| 73 | 78 | 
   dependencies:
 | 
| 74 | 
-  - tests-debian-stretch
 | 
|
| 75 | 
-  - build-docs
 | 
|
| 79 | 
+  - coverage
 | 
|
| 80 | 
+  - documentation
 | 
|
| 76 | 81 | 
   script:
 | 
| 77 | 82 | 
   - cp -a coverage/* public/
 | 
| 78 | 83 | 
   - cp -a documentation/* public/
 | 
| 79 | 84 | 
   artifacts:
 | 
| 80 | 85 | 
     paths:
 | 
| 81 | 86 | 
     - public/
 | 
| 82 | 
-  only:
 | 
|
| 83 | 
-  - master
 | 
