diff options
| author | Gaëtan Gilbert | 2020-06-27 22:05:12 +0200 |
|---|---|---|
| committer | Gaëtan Gilbert | 2020-06-27 22:05:12 +0200 |
| commit | 6e5fee168d874b7b6fe7d5c8f4384661bf328d79 (patch) | |
| tree | 683afae8f3f221b753f96cd459683d91fc207459 | |
| parent | c9ca432c1457bec080f98180bc5ef12ebdf57863 (diff) | |
| parent | 8d595f42df20bdc90fdafb8f16cc9f39b4478035 (diff) | |
Merge PR #12518: [ci] [ocaml] Track OCaml 4.12
Reviewed-by: SkySkimmer
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7915cc34fb..9e04762d1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -582,7 +582,7 @@ test-suite:edge:dune:dev: # Gitlab doesn't support yet "expire_in: never" so we use the instance default # expire_in: never -test-suite:edge+4.11+trunk+dune: +.test-suite:ocaml+beta+dune-template: stage: stage-1 except: variables: @@ -590,11 +590,11 @@ test-suite:edge+4.11+trunk+dune: interruptible: true dependencies: [] script: - - opam switch create 4.11.0 --empty + - opam switch create $OCAMLVER --empty - eval $(opam env) - opam repo add ocaml-beta https://github.com/ocaml/ocaml-beta-repository.git - opam update - - opam install ocaml-variants=4.11.0+trunk + - opam install ocaml-variants=$OCAMLVER - opam install dune num - eval $(opam env) - export COQ_UNIT_TEST=noop @@ -610,6 +610,16 @@ test-suite:edge+4.11+trunk+dune: expire_in: 2 week allow_failure: true +test-suite:4.11+trunk+dune: + extends: .test-suite:ocaml+beta+dune-template + variables: + OCAMLVER: 4.11.0+trunk + +test-suite:4.12+trunk+dune: + extends: .test-suite:ocaml+beta+dune-template + variables: + OCAMLVER: 4.12.0+trunk + test-suite:base+async: extends: .test-suite-template dependencies: |