From caf84834dd96d8b31c07e21daf0c953a52210d08 Mon Sep 17 00:00:00 2001 From: Tim Besard Date: Thu, 4 Apr 2019 16:43:47 +0200 Subject: [PATCH] Install dependencies from master through CI. --- .gitlab-ci.yml | 13 +++++++------ docs/make.jl | 5 ----- test/runtests.jl | 8 -------- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52b8e3ec..ab2188df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,14 @@ variables: CI_IMAGE_TAG: 'cuda' + CI_DEV_PKGS: 'CUDAdrv LLVM CuArrays' include: - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v2/common.yml' - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v2/test_v1.0.yml' - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v2/test_v1.1.yml' - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v2/test_dev.yml' - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v2/coverage_v1.1.yml' - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v2/documentation_v1.1.yml' + - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/common.yml' + - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.0.yml' + - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.1.yml' + - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_dev.yml' + - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/coverage_v1.1.yml' + - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/documentation_v1.1.yml' test:dev: allow_failure: true diff --git a/docs/make.jl b/docs/make.jl index 3b55e311..7a1114fa 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,10 +1,5 @@ using Documenter -using Pkg -if haskey(ENV, "GITLAB_CI") - Pkg.add([PackageSpec(name = x; rev = "master") for x in ["CUDAdrv", "LLVM"]]) -end - using CUDAnative makedocs( diff --git a/test/runtests.jl b/test/runtests.jl index 0ca46096..97eeae74 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,13 +1,5 @@ using Test -# development often happens in lockstep with other packages, -# so check-out the master branch of those packages. -using Pkg -if haskey(ENV, "GITLAB_CI") - Pkg.add([PackageSpec(name = x; rev = "master") - for x in ["CUDAdrv", "LLVM", "CuArrays"]]) -end - using CUDAnative, CUDAdrv import LLVM