Skip to content

Commit 0fa53f4

Browse files
committed
try standardising coverage
1 parent 1200c9e commit 0fa53f4

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed

appveyor.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ environment:
66
- julia_version: 0.7.0
77
- julia_version: 1
88
- julia_version: nightly
9+
coveralls: true
10+
codecov: true
911

1012
platform:
1113
- x86
@@ -45,5 +47,5 @@ test_script:
4547
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
4648

4749
on_success:
48-
- echo "%JL_CODECOV_SCRIPT%"
49-
- C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"
50+
- echo "%JL_SUCCESS_SCRIPT%"
51+
- C:\julia\bin\julia -e "%JL_SUCCESS_SCRIPT%"

bin/install.ps1

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,46 @@ if ($env:APPVEYOR_REPO_NAME -match "(\w+?)\/(\w+?)(?:\.jl)?$") {
5252
$projectname = $matches[2]
5353
}
5454

55+
56+
# Coverage
57+
58+
$coverage = ""
59+
if (Test-Path env:CODECOV) {
60+
$coverage += "Codecov.submit(process_folder());"
61+
}
62+
if (Test-Path env:COVERALLS) {
63+
$coverage += "Coveralls.submit(process_folder());"
64+
}
65+
5566
if ($julia_version -ge [Version]"0.7") {
5667
if (Test-Path "Project.toml") {
5768
$env:JULIA_PROJECT = "@." # TODO: change this to --project="@."
5869
$env:JL_BUILD_SCRIPT = "using Pkg; Pkg.build()"
5970
$env:JL_TEST_SCRIPT = "using Pkg; Pkg.test(coverage=true)"
71+
$env:JL_SUCCESS_SCRIPT = "using Pkg;"
72+
if ($coverage -ne "") {
73+
$env:JL_SUCCESS_SCRIPT += "Pkg.add(\`"Coverage\`"); using Coverage; $coverage"
74+
}
75+
# to be removed in next iteration
6076
$env:JL_CODECOV_SCRIPT = "using Pkg; Pkg.add(\`"Coverage\`"); using Coverage; Codecov.submit(process_folder())"
6177
} else {
6278
$env:JL_BUILD_SCRIPT = "using Pkg; Pkg.clone(pwd(), \`"$projectname\`"); Pkg.build(\`"$projectname\`")"
6379
$env:JL_TEST_SCRIPT = "using Pkg; Pkg.test(\`"$projectname\`", coverage=true)"
80+
$env:JL_SUCCESS_SCRIPT = "using Pkg;"
81+
if ($coverage -ne "") {
82+
$env:JL_SUCCESS_SCRIPT += "cd(Pkg.dir(\`"$projectname\`")); Pkg.add(\`"Coverage\`"); using Coverage; $coverage"
83+
}
84+
# to be removed in next iteration
6485
$env:JL_CODECOV_SCRIPT = "using Pkg; cd(Pkg.dir(\`"$projectname\`")); Pkg.add(\`"Coverage\`"); using Coverage; Codecov.submit(process_folder())"
6586
}
6687
} else {
6788
$env:JL_BUILD_SCRIPT = "Pkg.clone(pwd(), \`"$projectname\`"); Pkg.build(\`"$projectname\`")"
6889
$env:JL_TEST_SCRIPT = "Pkg.test(\`"$projectname\`", coverage=true)"
90+
$env:JL_SUCCESS_SCRIPT = ""
91+
if ($coverage -ne "") {
92+
$env:JL_SUCCESS_SCRIPT += "cd(Pkg.dir(\`"$projectname\`")); Pkg.add(\`"Coverage\`"); using Coverage; $coverage"
93+
}
94+
# to be removed in next iteration
6995
$env:JL_CODECOV_SCRIPT = "cd(Pkg.dir(\`"$projectname\`")); Pkg.add(\`"Coverage\`"); using Coverage; Codecov.submit(process_folder())"
7096
}
7197

0 commit comments

Comments
 (0)