Tweak CI files

.appveyor.yml

@@ -28,11 +28,10 @@ install:
 build_script:
 # Need to convert from shallow to complete for Pkg.clone to work
   - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo();
+  - C:\projects\julia\bin\julia -e "versioninfo(); Pkg.clone(pwd())"
-      Pkg.clone(pwd(), \"PkgTemplates\"); Pkg.build(\"PkgTemplates\")"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "Pkg.test(\"PkgTemplates\")"
+  - C:\projects\julia\bin\julia -e "Pkg.test(\"PkgTemplates\"; coverage=true)"
 
 after_script:
   - C:\projects\julia\bin\julia -e "cd(Pkg.dir(\"AppVeyorTesting\")); Pkg.add(\"Coverage\"); using Coverage; Codecov.submit(process_folder())"

.travis.yml

@@ -1,4 +1,3 @@
-# Documentation: http://docs.travis-ci.com/user/languages/julia/
 language: julia
 os:
   - linux
@@ -8,10 +7,11 @@ julia:
   - nightly
 notifications:
   email: false
+before_script:
+  - cp docs/src/assets/invenia.css $HOME
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'Pkg.clone(pwd()); Pkg.build("PkgTemplates"); Pkg.test("PkgTemplates"; coverage=true)'
+  - julia -e 'Pkg.clone(pwd()); Pkg.test("PkgTemplates"; coverage=true)'
 after_success:
   - julia -e 'cd(Pkg.dir("PkgTemplates")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
-  - julia -e 'Pkg.add("Documenter")'
+  - julia -e 'Pkg.add("Documenter"); cd(Pkg.dir("PkgTemplates")); include(joinpath("docs", "make.jl"))'
-  - julia -e 'cd(Pkg.dir("PkgTemplates")); include(joinpath("docs", "make.jl"))'

defaults/appveyor.yml

@@ -18,21 +18,20 @@ notifications:
 
 install:
   - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# Download most recent Julia Windows binary
+  # Download most recent Julia Windows binary
   - ps: (new-object net.webclient).DownloadFile(
         $env:JULIA_URL,
         "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
+  # Run installer silently, output to C:\projects\julia
   - C:\projects\julia-binary.exe /S /D=C:\projects\julia
 
 build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
+  # Need to convert from shallow to complete for Pkg.clone to work
   - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo();
+  - C:\projects\julia\bin\julia -e "versioninfo(); Pkg.clone(pwd(), \"{{PKGNAME}}\"); Pkg.build(\"{{PKGNAME}}\")"
-      Pkg.clone(pwd(), \"{{PKGNAME}}\"); Pkg.build(\"{{PKGNAME}}\")"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "Pkg.test(\"{{PKGNAME}}\")"{{#AFTER}}
+  - C:\projects\julia\bin\julia -e "Pkg.test(\"{{PKGNAME}}\"{{#AFTER}}; coverage=true{{/AFTER}})"{{#AFTER}}
 
 after_script:{{#CODECOV}}
   - C:\projects\julia\bin\julia -e "cd(Pkg.dir(\"{{PKGNAME}}\")); Pkg.add(\"Coverage\"); using Coverage; Codecov.submit(process_folder())"{{/CODECOV}}{{#COVERALLS}}

defaults/travis.yml

@@ -14,5 +14,4 @@ script:
 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}}
-  - julia -e 'Pkg.add("Documenter")'
+  - julia -e 'Pkg.add("Documenter"); cd(Pkg.dir("{{PKGNAME}}")); include(joinpath("docs", "make.jl"))'{{/DOCUMENTER}}{{/AFTER}}
-  - julia -e 'cd(Pkg.dir("{{PKGNAME}}")); include(joinpath("docs", "make.jl"))'{{/DOCUMENTER}}{{/AFTER}}

test/tests.jl

@@ -426,6 +426,7 @@ end
     @test gen_plugin(p, t, test_pkg) == [".appveyor.yml"]
     @test isfile(joinpath(pkg_dir, ".appveyor.yml"))
     appveyor = readstring(joinpath(pkg_dir, ".appveyor.yml"))
+    @test !contains(appveyor, "coverage=true")
     @test !contains(appveyor, "after_script")
     @test !contains(appveyor, "Codecov.submit")
     @test !contains(appveyor, "Coveralls.submit")
@@ -434,6 +435,7 @@ end
     gen_plugin(p, t, test_pkg)
     delete!(t.plugins, CodeCov)
     appveyor = readstring(joinpath(pkg_dir, ".appveyor.yml"))
+    @test contains(appveyor, "coverage=true")
     @test contains(appveyor, "after_script")
     @test contains(appveyor, "Codecov.submit")
     @test !contains(appveyor, "Coveralls.submit")
@@ -442,6 +444,7 @@ end
     gen_plugin(p, t, test_pkg)
     delete!(t.plugins, Coveralls)
     appveyor = readstring(joinpath(pkg_dir, ".appveyor.yml"))
+    @test contains(appveyor, "coverage=true")
     @test contains(appveyor, "after_script")
     @test contains(appveyor, "Coveralls.submit")
     @test !contains(appveyor, "Codecov.submit")