Skip to content

Commit c90a555

Browse files
author
Chris Foster
committed
Update CI config
1 parent b521dcf commit c90a555

File tree

2 files changed

+27
-31
lines changed

2 files changed

+27
-31
lines changed

.travis.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,27 @@
1-
## Documentation: http://docs.travis-ci.com/user/languages/julia/
1+
# Documentation: http://docs.travis-ci.com/user/languages/julia/
22
language: julia
33
os:
44
- linux
55
- osx
66
julia:
7-
- 0.5
87
- 0.6
8+
- 0.7
9+
- 1.0
910
- nightly
11+
branches:
12+
only:
13+
- master
14+
- /^v[0-9]+\.[0-9]+\.[0-9]+$/ # version tags for Documenter.jl
15+
matrix:
16+
allow_failures:
17+
- julia: nightly
1018
notifications:
1119
email: false
1220
# uncomment the following lines to override the default test script
1321
#script:
1422
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
1523
# - julia -e 'Pkg.clone(pwd()); Pkg.build("PlyIO"); Pkg.test("PlyIO"; coverage=true)'
1624
after_success:
17-
# push coverage results to Coveralls
18-
- julia -e 'cd(Pkg.dir("PlyIO")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
19-
# push coverage results to Codecov
20-
- julia -e 'cd(Pkg.dir("PlyIO")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
25+
- if [ $TRAVIS_JULIA_VERSION = "1.0" ] && [ $TRAVIS_OS_NAME = "linux" ]; then
26+
julia -e 'cd(Pkg.dir("MicroLogging")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
27+
fi

appveyor.yml

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
environment:
22
matrix:
3-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
4-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
5-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
6-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
7-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
8-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
3+
- julia_version: 0.7
4+
- julia_version: 1
5+
- julia_version: latest
6+
7+
platform:
8+
- x86 # 32-bit
9+
- x64 # 64-bit
910

1011
## uncomment the following lines to allow failures on nightly julia
1112
## (tests will run but not make your overall status red)
1213
matrix:
1314
allow_failures:
14-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
15-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
15+
- julia_version: latest
16+
1617

1718
branches:
1819
only:
@@ -26,24 +27,12 @@ notifications:
2627
on_build_status_changed: false
2728

2829
install:
29-
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
30-
# If there's a newer build queued for the same PR, cancel this one
31-
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
32-
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
33-
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
34-
throw "There are newer queued builds for this pull request, failing early." }
35-
# Download most recent Julia Windows binary
36-
- ps: (new-object net.webclient).DownloadFile(
37-
$env:JULIA_URL,
38-
"C:\projects\julia-binary.exe")
39-
# Run installer silently, output to C:\projects\julia
40-
- C:\projects\julia-binary.exe /S /D=C:\projects\julia
30+
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
4131

4232
build_script:
43-
# Need to convert from shallow to complete for Pkg.clone to work
44-
- IF EXIST .git\shallow (git fetch --unshallow)
45-
- C:\projects\julia\bin\julia -e "versioninfo();
46-
Pkg.clone(pwd(), \"PlyIO\"); Pkg.build(\"PlyIO\")"
33+
- echo "%JL_BUILD_SCRIPT%"
34+
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
4735

4836
test_script:
49-
- C:\projects\julia\bin\julia -e "Pkg.test(\"PlyIO\")"
37+
- echo "%JL_TEST_SCRIPT%"
38+
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

0 commit comments

Comments
 (0)