Update CI configs

JuliaCI · Oct 27, 2017 · 46066fd · 46066fd
1 parent 3b8abd5
commit 46066fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/defaults/gitlab-ci.yml b/defaults/gitlab-ci.yml
@@ -1,19 +1,19 @@
-stages:
-  - test{{#GITLABCOVERAGE}}
-  - coverage{{/GITLABCOVERAGE}}
+{{#GITLABCOVERAGE}}stages:
+  - test
+  - coverage
 
-.test_template: &test_template
-  stage: test
+{{/GITLABCOVERAGE}}.test_template: &test_template
+  stage: test{{#GITLABCOVERAGE}}
   artifacts:
     name: coverage
     expire_in: 2 hours
     paths:
-      - coverage/
+      - coverage/{{/GITLABCOVERAGE}}
   tags:
     - docker
   script:
-    - julia -e 'Pkg.clone(pwd()); Pkg.build("{{PKGNAME}}"); Pkg.test("{{PKGNAME}}"{{#GITLABCOVERAGE}}; coverage=true
-    - cp -r $(julia -e 'print(Pkg.dir("{{PKGNAME}}", "src"))') coverage{{/GITLABCOVERAGE}})'
+    - julia -e 'Pkg.clone(pwd()); Pkg.build("{{PKGNAME}}"); Pkg.test("{{PKGNAME}}"{{#GITLABCOVERAGE}}; coverage=true{{/GITLABCOVERAGE}})'{{#GITLABCOVERAGE}}
+    - cp -r $(julia -e 'print(Pkg.dir("{{PKGNAME}}", "src"))') coverage{{/GITLABCOVERAGE}}
 
 Julia {{VERSION}}:
   image: julia:{{VERSION}}
@@ -26,7 +26,7 @@ Julia nightly:
 
 "Coverage":
   stage: coverage
-  image: julia:0.6
+  image: julia:{{VERSION}}
   tags:
     - docker
   before_script:

diff --git a/defaults/travis.yml b/defaults/travis.yml
@@ -14,7 +14,7 @@ notifications:
   email: false
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'Pkg.clone(pwd()); Pkg.build("{{PKGNAME}}"); Pkg.test("{{PKGNAME}}"; coverage=true)'{{#AFTER}}
+  - julia -e 'Pkg.clone(pwd()); Pkg.build("{{PKGNAME}}"); Pkg.test("{{PKGNAME}}"{{#AFTER}}; coverage=true{{/AFTER}})'{{#AFTER}}
 after_success:{{#CODECOV}}
   - julia -e 'cd(Pkg.dir("{{PKGNAME}}")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'{{/CODECOV}}{{#COVERALLS}}
   - julia -e 'cd(Pkg.dir("{{PKGNAME}}")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())'{{/COVERALLS}}{{#DOCUMENTER}}