Skip to content

Commit ad2cb98

Browse files
committed
Enable Bors.
1 parent b7e4d9a commit ad2cb98

File tree

4 files changed

+42
-8
lines changed

4 files changed

+42
-8
lines changed

.appveyor.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
environment:
22
matrix:
3-
- julia_version: 1.0
4-
- julia_version: latest
3+
- julia_version: 1.0
4+
- julia_version: latest
55

66
platform:
77
- x86
88
- x64
99

1010
matrix:
1111
allow_failures:
12-
- julia_version: latest
12+
- julia_version: latest
1313

1414
branches:
1515
only:
16-
- master
17-
- /release-.*/
16+
- staging
17+
- trying
1818

1919
notifications:
2020
- provider: Email

.gitlab-ci.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,23 @@ include:
1212
- 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v0/postprocess_coverage.yml'
1313
- 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v1/postprocess_documentation.yml'
1414

15+
test:v1.0:
16+
only:
17+
- staging
18+
- trying
19+
1520
test:dev:
1621
allow_failure: true
22+
only:
23+
- staging
24+
- trying
25+
26+
documentation:
27+
only:
28+
- staging
29+
- trying
30+
31+
coverage:
32+
only:
33+
- staging
34+
- trying

.travis.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
1-
# Documentation: http://docs.travis-ci.com/user/languages/julia/
21
language: julia
2+
33
os:
44
- linux
55
- osx
6+
67
dist: trusty
8+
79
julia:
810
- 1.0
911
- nightly
12+
1013
matrix:
11-
allow_failures:
12-
- julia: nightly
14+
allow_failures:
15+
- julia: nightly
16+
17+
branches:
18+
only:
19+
- staging
20+
- trying
21+
1322
notifications:
1423
email: false
24+
1525
after_success:
1626
- julia -e 'ps=Pkg.PackageSpec(name="Documenter", version="0.19"); Pkg.add(ps); Pkg.pin(ps)'
1727
- julia -e 'cd(Pkg.dir("GPUArrays")); include(joinpath("docs", "make.jl"))'

bors.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
status = [
2+
"ci/gitlab/%",
3+
"continuous-integration/appveyor/branch",
4+
"continuous-integration/travis-ci/push"
5+
]
6+
delete_merged_branches = true

0 commit comments

Comments
 (0)