Merge pull request #179 from JuliaGPU/tb/match

Bors

Author: maleadt

.appveyor.yml

@@ -1,20 +1,20 @@
 environment:
   matrix:
-  - julia_version: 1.0
-  - julia_version: latest
+    - julia_version: 1.0
+    - julia_version: latest
 
 platform:
   - x86
   - x64
 
 matrix:
   allow_failures:
-  - julia_version: latest
+     - julia_version: latest
 
 branches:
   only:
-    - master
-    - /release-.*/
+    - staging
+    - trying
 
 notifications:
   - provider: Email

.gitlab-ci.yml

@@ -12,5 +12,23 @@ include:
   - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v0/postprocess_coverage.yml'
   - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v1/postprocess_documentation.yml'
 
+test:v1.0:
+  only:
+    - staging
+    - trying
+
 test:dev:
   allow_failure: true
+  only:
+    - staging
+    - trying
+
+documentation:
+  only:
+    - staging
+    - trying
+
+coverage:
+  only:
+    - staging
+    - trying

.travis.yml

@@ -1,17 +1,27 @@
-# Documentation: http://docs.travis-ci.com/user/languages/julia/
 language: julia
+
 os:
   - linux
   - osx
+
 dist: trusty
+
 julia:
   - 1.0
   - nightly
+
 matrix:
- allow_failures:
- - julia: nightly
+  allow_failures:
+    - julia: nightly
+
+branches:
+  only:
+    - staging
+    - trying
+
 notifications:
   email: false
+
 after_success:
   - julia -e 'ps=Pkg.PackageSpec(name="Documenter", version="0.19"); Pkg.add(ps); Pkg.pin(ps)'
   - julia -e 'cd(Pkg.dir("GPUArrays")); include(joinpath("docs", "make.jl"))'

bors.toml

@@ -0,0 +1,6 @@
+status = [
+  "ci/gitlab/%",
+  "continuous-integration/appveyor/branch",
+  "continuous-integration/travis-ci/push"
+]
+delete_merged_branches = true

test/runtests.jl

@@ -1,19 +1,9 @@
-# GPUArrays development often happens in lockstep with other packages, so try to match branches
+# development often happens in lockstep with other packages,
+# so check-out the master branch of those packages.
 using Pkg
-function match_package(package, var)
-    try
-        branch = ENV[var]
-        Pkg.add(PackageSpec(name=package, rev=branch))
-        @info "Installed $package from branch $branch"
-    catch ex
-        @warn "Could not install $package from $branch branch, trying master" exception=ex
-        Pkg.add(PackageSpec(name=package, rev="master"))
-        @info "Installed $package from master"
-    end
+if haskey(ENV, "TRAVIS") || haskey(ENV, "APPVEYOR") || haskey(ENV, "GITLAB_CI")
+    Pkg.add(PackageSpec(name="Adapt", rev="master"))
 end
-haskey(ENV, "TRAVIS")    && match_package("Adapt", "TRAVIS_PULL_REQUEST_BRANCH")
-haskey(ENV, "APPVEYOR")  && match_package("Adapt", "APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH")
-haskey(ENV, "GITLAB_CI") && match_package("Adapt", "CI_COMMIT_REF_NAME")
 
 using GPUArrays, Test
 
@@ -22,7 +12,7 @@ using GPUArrays, Test
 end
 
 if haskey(ENV, "GITLAB_CI")
-    match_package("CuArrays", "CI_COMMIT_REF_NAME")
+    Pkg.add(PackageSpec(name="CuArrays", rev="master"))
     @testset "CuArray" begin
         Pkg.test("CuArrays")
     end