updates for v1.5, etc.

.travis.yml

@@ -12,12 +12,11 @@ os:
   - windows
 
 arch:
-  - x64
-  - x86
+  - amd64
+  - i386
 
 julia:
   - "1.0"
-  - "1.4"
   - "1"   # Latest stable release (currently "1.5")
   - nightly
 
@@ -26,11 +25,18 @@ jobs:
   allow_failures:
     - julia: nightly
 
-  # Test 32-bit only on Linux
   exclude:
-    - arch: x86
+    # Test 32-bit only on Linux
+    - arch: i386
       os: osx
-    - arch: x86
+    - arch: i386
+      os: windows
+    # Test fewer versions too
+    - julia: "1.0"
+      os: osx
+    - julia: nightly
+      os: osx
+    - julia: "1.0"
       os: windows
 
 notifications:
@@ -39,8 +45,9 @@ notifications:
 
 script:
   - julia --color=yes --check-bounds=yes etc/travis-test.jl
-  - export COVERALLS_PARALLEL=true
-  # submit coverage data, and collect new coverage data on that
-  - julia --color=yes --code-coverage=user etc/travis-coverage.jl
+  # submit coverage data to a black hole server with a fake job-id,
+  # and collect new coverage data on that
+  - COVERALLS_URL=https://httpbingo.julialang.org/post
+    julia --color=yes --code-coverage=user etc/travis-coverage.jl
   # submit coverage data *again*, this time without code coverage
   - julia --color=yes etc/travis-coverage.jl

README.md

@@ -178,17 +178,6 @@ When using Coverage.jl locally, over time a lot of `.cov` files can accumulate.
        - C:\projects\julia\bin\julia -e "using Pkg; Pkg.add(\"Coverage\"); using Coverage; Coveralls.submit(process_folder())"
        ```
 
-4. If you are uploading from multiple jobs, you'll need to tell Coveralls to merge the results after all CI jobs have completed. See https://docs.coveralls.io/parallel-build-webhook for general instructions.
-
-    For Travis, this can be achieved by adding the following to `.travis.yml`:
-
-        env:
-          global:
-            - COVERALLS_PARALLEL=true
-        notifications:
-          webhooks: https://coveralls.io/webhook
-
-
 ## A note for advanced users
 
 Coverage tracking in Julia is not yet quite perfect. One problem is that (at

src/codecovio.jl

@@ -46,16 +46,14 @@ module Codecov
     kwargs provides default values to insert into args_array, only if they are
     not already specified in args_array.
     """
-    function set_defaults(args_array; kwargs...)
-        defined_names = keys(args_array)
-        is_args_array = Pair{Symbol, Any}[]
-        is_args_array = append!(is_args_array, args_array)
+    function set_defaults(args_array::Dict; kwargs...)
+        args_array = copy(args_array)
         for kwarg in kwargs
-            if !(kwarg[1] in defined_names)
-                push!(is_args_array, kwarg)
+            if !haskey(args_array, kwarg[1])
+                push!(args_array, kwarg)
             end
         end
-        return is_args_array
+        return args_array
     end
 
     """
@@ -66,11 +64,12 @@ module Codecov
     on TravisCI or AppVeyor. If running locally, use `submit_local`.
     """
     function submit(fcs::Vector{FileCoverage}; kwargs...)
-        submit_generic(fcs; add_ci_to_kwargs(;kwargs...)...)
+        submit_generic(fcs, add_ci_to_kwargs(; kwargs...))
     end
 
 
-    function add_ci_to_kwargs(;kwargs...)
+    add_ci_to_kwargs(; kwargs...) = add_ci_to_kwargs(Dict{Symbol,Any}(kwargs))
+    function add_ci_to_kwargs(kwargs::Dict)
         if lowercase(get(ENV, "APPVEYOR", "false")) == "true"
             appveyor_pr = get(ENV, "APPVEYOR_PULL_REQUEST_NUMBER", "")
             appveyor_job = join(
@@ -161,10 +160,11 @@ module Codecov
     `token` keyword argument or the `CODECOV_TOKEN` environment variable.
     """
     function submit_local(fcs::Vector{FileCoverage}, dir::AbstractString=pwd(); kwargs...)
-        submit_generic(fcs; add_local_to_kwargs(dir; kwargs...)...)
+        submit_generic(fcs, add_local_to_kwargs(dir; kwargs...))
     end
 
-    function add_local_to_kwargs(dir; kwargs...)
+    add_local_to_kwargs(dir; kwargs...) = add_local_to_kwargs(dir, Dict{Symbol,Any}(kwargs))
+    function add_local_to_kwargs(dir, kwargs::Dict)
         LibGit2.with(LibGit2.GitRepoExt(dir)) do repo
             LibGit2.with(LibGit2.head(repo)) do headref
                 branch_name = LibGit2.shortname(headref) # this function returns a String
@@ -199,7 +199,9 @@ module Codecov
     The `dry_run` keyword can be used to prevent the http request from
     being generated.
     """
-    function submit_generic(fcs::Vector{FileCoverage}; kwargs...)
+    submit_generic(fcs::Vector{FileCoverage}; kwargs...) =
+        submit_generic(fcs, Dict{Symbol,Any}(kwargs))
+    function submit_generic(fcs::Vector{FileCoverage}, kwargs::Dict)
         @assert length(kwargs) > 0
         dry_run = get(kwargs, :dry_run, false)
         if haskey(kwargs, :verbose)
@@ -209,7 +211,8 @@ module Codecov
         else
             verbose = false
         end
-        uri_str = construct_uri_string(;kwargs...)
+
+        uri_str = construct_uri_string(kwargs)
 
         verbose && @info "Submitting data to Codecov..."
         verbose && @debug "Codecov.io API URL:\n" * mask_token(uri_str)
@@ -222,25 +225,24 @@ module Codecov
         end
     end
 
-    function construct_uri_string(;kwargs...)
-        if haskey(ENV, "CODECOV_URL")
-            kwargs = set_defaults(kwargs, codecov_url = ENV["CODECOV_URL"])
-        end
+    function construct_uri_string(kwargs::Dict)
+        url = get(ENV, "CODECOV_URL", "")
+        isempty(url) || (kwargs = set_defaults(kwargs, codecov_url = url))
 
-        if haskey(ENV, "CODECOV_TOKEN")
-            kwargs = set_defaults(kwargs, token = ENV["CODECOV_TOKEN"])
-        end
+        token = get(ENV, "CODECOV_TOKEN", "")
+        isempty(token) || (kwargs = set_defaults(kwargs, token = token))
 
-        codecov_url = "https://codecov.io"
-        for (k,v) in kwargs
-            if k == :codecov_url
-                codecov_url = v
-            end
-        end
-        @assert codecov_url[end] != "/" "the codecov_url should not end with a /, given url $(codecov_url)"
+        flags = get(ENV, "CODECOV_FLAGS", "")
+        isempty(flags) || (kwargs = set_defaults(kwargs; flags = flags))
+
+        name = get(ENV, "CODECOV_NAME", "")
+        isempty(name) || (kwargs = set_defaults(kwargs; name = name))
+
+        codecov_url = get(kwargs, :codecov_url, "https://codecov.io")
+        codecov_url[end] == "/" && error("the codecov_url should not end with a /, given url $(repr(codecov_url))")
 
         uri_str = "$(codecov_url)/upload/v2?"
-        for (k,v) in kwargs
+        for (k, v) in kwargs
             # add all except a few special key/value pairs to the URL
             # (:verbose is there for backwards compatibility with versions
             # of this code that treated it in a special way)

src/coveralls.jl

@@ -40,14 +40,19 @@ module Coveralls
 
     # to_json
     # Convert a FileCoverage instance to its Coveralls JSON representation
-    to_json(fc::FileCoverage) = Dict("name"          => fc.filename,
-                                     "source_digest" => digest(MD_MD5, fc.source, "secret"),
-                                     "coverage"      => fc.coverage)
+    function to_json(fc::FileCoverage)
+        name = Sys.iswindows() ? replace(fc.filename, '\\' => '/') : fc.filename
+        return Dict("name"          => name,
+                    "source_digest" => digest(MD_MD5, fc.source, "secret"),
+                    "coverage"      => fc.coverage)
+    end
 
     # Format the body argument to HTTP.post
-    makebody(data::Dict) =
-        Dict("json_file" => HTTP.Multipart("json_file", IOBuffer(JSON.json(data)),
-                                           "application/json"))
+    function makebody(data::Dict)
+        iodata = IOBuffer(JSON.json(data))
+        json_file = HTTP.Multipart("json_file", iodata, "application/json")
+        return Dict("json_file" => json_file)
+    end
 
     """
         submit(fcs::Vector{FileCoverage}; kwargs...)
@@ -68,18 +73,21 @@ module Coveralls
         post_request(data, verbose)
     end
 
-    function prepare_request(fcs::Vector{FileCoverage}, local_env, git_info=query_git_info)
+    function prepare_request(fcs::Vector{FileCoverage}, local_env::Bool, git_info=query_git_info)
         data = Dict{String,Any}("source_files" => map(to_json, fcs))
 
         if local_env
             # Attempt to parse git info via git_info, unless the user explicitly disables it by setting git_info to nothing
+            data["service_name"] = "local"
             data["git"] = parse_git_info(git_info)
         elseif lowercase(get(ENV, "APPVEYOR", "false")) == "true"
-            data["service_job_id"] = ENV["APPVEYOR_JOB_ID"]
+            data["service_job_number"] = ENV["APPVEYOR_BUILD_NUMBER"]
+            data["service_job_id"] = ENV["APPVEYOR_BUILD_ID"]
             data["service_name"] = "appveyor"
             appveyor_pr = get(ENV, "APPVEYOR_PULL_REQUEST_NUMBER", "")
             isempty(appveyor_pr) || (data["service_pull_request"] = appveyor_pr)
         elseif lowercase(get(ENV, "TRAVIS", "false")) == "true"
+            data["service_number"] = ENV["TRAVIS_BUILD_NUMBER"]
             data["service_job_id"] = ENV["TRAVIS_JOB_ID"]
             data["service_name"] = "travis-ci"
             travis_pr = get(ENV, "TRAVIS_PULL_REQUEST", "")
@@ -94,8 +102,31 @@ module Coveralls
                 data["git"]["branch"] = split(ENV["GIT_BRANCH"], "/")[2]
             end
         elseif haskey(ENV, "GITHUB_ACTION")
+            data["service_name"] = "github"
             data["git"] = parse_git_info(git_info)
         else
+            data["git"] = parse_git_info(git_info)
+        end
+
+        service_name = get(ENV, "COVERALLS_SERVICE_NAME", "")
+        isempty(service_name) || (data["service_name"] = service_name)
+
+        service_number = get(ENV, "COVERALLS_SERVICE_NUMBER", "")
+        isempty(service_number) || (data["service_number"] = service_number)
+
+        service_job_number = get(ENV, "COVERALLS_SERVICE_JOB_NUMBER", "")
+        isempty(service_job_number) || (data["service_job_number"] = service_job_number)
+
+        jobid = get(ENV, "COVERALLS_SERVICE_JOB_ID", "")
+        isempty(jobid) || (data["service_job_id"] = jobid)
+
+        flag_name = get(ENV, "COVERALLS_FLAG_NAME", "")
+        isempty(flag_name) || (data["flag_name"] = flag_name)
+
+        ci_pr = get(ENV, "COVERALLS_PULL_REQUEST", "")
+        isempty(ci_pr) || (data["service_pull_request"] = ci_pr)
+
+        if !haskey(data, "service_name")
             error("No compatible CI platform detected")
         end
 
@@ -187,7 +218,8 @@ module Coveralls
     # posts the actual request given the data
     function post_request(data, verbose)
         verbose && @info "Submitting data to Coveralls..."
-        req = HTTP.post("https://coveralls.io/api/v1/jobs", HTTP.Form(makebody(data)))
+        coveralls_url = get(ENV, "COVERALLS_URL", "https://coveralls.io/api/v1/jobs")
+        req = HTTP.post(coveralls_url, HTTP.Form(makebody(data)))
         verbose && @debug "Result of submission:\n" * String(req.body)
         nothing
     end