diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e6a6d206..c0263fcf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,55 +2,27 @@ variables: CI_IMAGE_TAG: 'cuda' include: - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v1/common.yml' - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v1/test_v1.0.yml' - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v1/test_dev.yml' + - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v3/common.yml' -test:v1.0: - stage: test - image: "juliagpu/julia:v1.0-${CI_IMAGE_TAG}" +.flux: + extends: .test script: - julia -e 'using InteractiveUtils; versioninfo()' - mkdir $JULIA_DEPOT_PATH # Pkg3.jl#325 - julia -e 'using Pkg; Pkg.add("CuArrays");' - - julia --project -e 'using Pkg; Pkg.instantiate(); Pkg.build(); Pkg.test(; coverage=true);' -test:master: - stage: test - image: "juliagpu/julia:v1.0-${CI_IMAGE_TAG}" - script: - - julia -e 'using InteractiveUtils; - versioninfo()' - - mkdir $JULIA_DEPOT_PATH # Pkg3.jl#325 - - julia -e 'using Pkg; - Pkg.add(PackageSpec(name = "CUDAapi", rev = "master")); - Pkg.add(PackageSpec(name = "CUDAdrv", rev = "master")); - Pkg.add(PackageSpec(name = "CUDAnative", rev = "master")); - Pkg.add(PackageSpec(name = "CuArrays", rev = "master"));' +test:v1.0: + extends: .flux + variables: + CI_VERSION_TAG: 'v1.0' - - julia --project -e 'using Pkg - Pkg.instantiate(); - Pkg.build(); - Pkg.test(; coverage=true);' - allow_failure: true - - artifacts: - when: always - paths: - - Manifest.toml - - .julia/ - - deps/ext.jl - - deps/build.log - # gitlab-runner#2620 - - src/*.cov - - src/*/*.cov - - src/*/*/*.cov - -test:dev: - allow_failure: true +test:v1.1: + extends: .flux + variables: + CI_VERSION_TAG: 'v1.1'