Skip to content

Commit 42d7d83

Browse files
committed
Enable Travis and Appveyor again
1 parent 4f5a1b2 commit 42d7d83

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.travis.yml

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

2525
stages:
2626
- 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)
2927
- 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
28+
# build docs on master and for tags
29+
if: (branch = master AND type = push) OR tag IS present
3230

3331
script:
3432
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
@@ -45,10 +43,10 @@ jobs:
4543
- julia --project -e 'using Pkg; Pkg.activate("docs"); Pkg.instantiate(); Pkg.develop(PackageSpec(path = pwd()))'
4644
- julia --project=docs --color=yes docs/make.jl pdf
4745
after_success: skip
48-
- name: TOML (Julia 1.0)
46+
- name: TOML (Julia 1.3)
4947
stage: test
5048
os: linux
51-
julia: 1.0
49+
julia: 1.3
5250
script:
5351
- julia --project=ext/TOML -e 'using Pkg; Pkg.test()'
5452
after_success: skip

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ platform:
1515

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

2223
notifications:
2324
- provider: Email

0 commit comments

Comments
 (0)