Skip to content

Commit 1f2e8ab

Browse files
committed
Update build scripts
1 parent 9d1347b commit 1f2e8ab

File tree

2 files changed

+22
-32
lines changed

2 files changed

+22
-32
lines changed

.travis.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ os:
55
- osx
66
julia:
77
- 0.6
8+
- 0.7
9+
- 1.0
810
- nightly
911
notifications:
1012
email: false
@@ -13,16 +15,13 @@ git:
1315

1416
## uncomment the following lines to allow failures on nightly julia
1517
## (tests will run but not make your overall status red)
16-
#matrix:
17-
# allow_failures:
18-
# - julia: nightly
18+
matrix:
19+
allow_failures:
20+
- julia: nightly
1921

2022
# uncomment the following lines to override the default test script
2123
#script:
2224
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
2325
# - julia -e 'if VERSION < v"0.7.0-DEV.5183" ; Pkg.add("Compat") ; Pkg.clone(pwd()) ; else ; Pkg.up() ; end ; Pkg.test("Format"; coverage=true)'
2426
after_success:
25-
# push coverage results to Coveralls
26-
- julia -e 'cd(Pkg.dir("Format")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
27-
# push coverage results to Codecov
28-
- julia -e 'cd(Pkg.dir("Format")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
27+
- julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("SetFormat")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder()); Codecov.submit(Codecov.process_folder())'

appveyor.yml

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
environment:
22
matrix:
3-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
4-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
5-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
6-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
3+
- julia_version: 0.6
4+
- julia_version: 0.7
5+
- julia_version: 1.0
6+
- julia_version: latest
77

8+
platform:
9+
- x86 # 32-bit
10+
- x64 # 64-bit
11+
12+
## uncomment the following lines to allow failures on nightly julia
13+
## (tests will run but not make your overall status red)
814
#matrix:
915
# allow_failures:
10-
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
11-
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
16+
# - julia_version: latest
1217

1318
branches:
1419
only:
@@ -22,26 +27,12 @@ notifications:
2227
on_build_status_changed: false
2328

2429
install:
25-
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
26-
# If there's a newer build queued for the same PR, cancel this one
27-
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
28-
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
29-
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
30-
throw "There are newer queued builds for this pull request, failing early." }
31-
# Download most recent Julia Windows binary
32-
- ps: (new-object net.webclient).DownloadFile(
33-
$env:JULIA_URL,
34-
"C:\projects\julia-binary.exe")
35-
# Run installer silently, output to C:\projects\julia
36-
- 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"))
3731

3832
build_script:
39-
# Need to convert from shallow to complete for Pkg.clone to work
40-
- IF EXIST .git\shallow (git fetch --unshallow)
41-
- C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using InteractiveUtils);
42-
versioninfo();
43-
if VERSION < v\"0.7.0-DEV.5183\"; Pkg.add(\"Compat\"); Pkg.clone(pwd(), \"Format\");
44-
else; using Pkg; Pkg.add(pwd()); Pkg.up(); end"
33+
- echo "%JL_BUILD_SCRIPT%"
34+
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
4535

4636
test_script:
47-
- C:\projects\julia\bin\julia -e "Pkg.test(\"Format\")"
37+
- echo "%JL_TEST_SCRIPT%"
38+
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

0 commit comments

Comments
 (0)