Skip to content

Commit 25e2265

Browse files
committed
Enable Travis and Appveyor again
1 parent 45be6f6 commit 25e2265

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

.travis.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ branches:
1919
only:
2020
- master
2121
- staging
22-
- trying
2322
- /^v[0-9]+\.[0-9]+\.[0-9]+$/ # version tags
2423

2524
stages:
2625
- name: test
27-
# test only on bors trying and bors staging, and run master with linux/nightly for coverage
28-
if: branch IN (trying, staging) OR (branch = master AND os = linux AND env(TRAVIS_JULIA_VERSION) = nightly)
2926
- name: docs
30-
# build docs on bors trying, bors staging, master and for tags
31-
if: branch IN (trying, staging) OR (branch = master AND type = push) OR tag IS present
27+
# build docs on master and for tags
28+
if: (branch = master AND type = push) OR tag IS present
3229

3330
script:
3431
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
@@ -45,10 +42,10 @@ jobs:
4542
- julia --project -e 'using Pkg; Pkg.activate("docs"); Pkg.instantiate(); Pkg.develop(PackageSpec(path = pwd()))'
4643
- julia --project=docs --color=yes docs/make.jl pdf
4744
after_success: skip
48-
- name: TOML (Julia 1.0)
45+
- name: TOML (Julia 1.3)
4946
stage: test
5047
os: linux
51-
julia: 1.0
48+
julia: 1.3
5249
script:
5350
- julia --project=ext/TOML -e 'using Pkg; Pkg.test()'
5451
after_success: skip

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ platform:
1515

1616
branches:
1717
only:
18+
- master
1819
- staging
19-
- trying
2020
- /^v[0-9]+\.[0-9]+\.[0-9]+$/ # version tags
2121

2222
notifications:

0 commit comments

Comments
 (0)