diff options
| author | Erik Martin-Dorel | 2019-03-22 02:56:56 +0100 |
|---|---|---|
| committer | Erik Martin-Dorel | 2019-04-16 15:22:28 +0200 |
| commit | 19ab5bad5ceece0680d94114f3bef9b2a4b0c195 (patch) | |
| tree | 08f55df592aa52057a2dd8a5a0b0eaaf0ef0a926 | |
| parent | 98c66b28153d7c7d520a96fb73570e80651bd47d (diff) | |
Add commentary sections & Swap order of .make-build, .opam-build
| -rw-r--r-- | .gitlab-ci.yml | 54 |
1 files changed, 33 insertions, 21 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0eabf4..1423e9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,32 @@ stages: - build - test +################ +#### build stage +################ + +# set var OPAM_SWITCH (if need be) and COQ_VERSION when using +.make-build: + stage: build + image: docker:latest + services: + - docker:dind + variables: + # This image will be built locally only (not pushed) + IMAGE: "mathcomp-dev:make_coq-${COQ_VERSION}" + OPAM_SWITCH: "edge" + before_script: + script: + - docker build -f Dockerfile.make --pull --build-arg=coq_image="coqorg/coq:${COQ_VERSION}" --build-arg=compiler="${OPAM_SWITCH}" -t "${IMAGE}" . + except: + - tags + - merge_requests + +make-coq-latest: + extends: .make-build + variables: + COQ_VERSION: "latest" + # set var OPAM_SWITCH (if need be) when using .opam-build: stage: build @@ -68,28 +94,10 @@ coq-8.9: coq-dev: extends: .opam-build -# set var OPAM_SWITCH (if need be) and COQ_VERSION when using -.make-build: - stage: build - image: docker:latest - services: - - docker:dind - variables: - # This image will be built locally only (not pushed) - IMAGE: "mathcomp-dev:make_coq-${COQ_VERSION}" - OPAM_SWITCH: "edge" - before_script: - script: - - docker build -f Dockerfile.make --pull --build-arg=coq_image="coqorg/coq:${COQ_VERSION}" --build-arg=compiler="${OPAM_SWITCH}" -t "${IMAGE}" . - except: - - tags - - merge_requests +################ +##### test stage +################ -make-coq-latest: - extends: .make-build - variables: - COQ_VERSION: "latest" - # set CONTRIB_URL, script, COQ_VERSION, CONTRIB_VERSION when using .ci: stage: test @@ -180,3 +188,7 @@ ci-lemma-overloading-dev: extends: .ci-lemma-overloading variables: COQ_VERSION: "dev" + +################ +### deploy stage +################ |