From 1624bfe8406017cff82904ebab3d06a9dec17153 Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel
Date: Mon, 29 Jul 2019 23:34:16 +0200
Subject: style: fix indentation detail

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65a71ed..d7d8ba9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -159,14 +159,14 @@ ci-fourcolor-dev:
     - make install
 
 ci-odd-order-8.7:
- extends: .ci-odd-order
- variables:
-   COQ_VERSION: "8.7"
+  extends: .ci-odd-order
+  variables:
+    COQ_VERSION: "8.7"
 
 ci-odd-order-8.8:
- extends: .ci-odd-order
- variables:
-   COQ_VERSION: "8.8"
+  extends: .ci-odd-order
+  variables:
+    COQ_VERSION: "8.8"
 
 ci-odd-order-dev:
   extends: .ci-odd-order
-- 
cgit v1.2.3


From b8eadb8603b83c053a313b39c2a8f268385d8942 Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel
Date: Mon, 29 Jul 2019 23:39:05 +0200
Subject: refactor: deploy jobs need not clone the repo

* Set "GIT_STRATEGY: none" accordingly
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7d8ba9..81c7b7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -327,6 +327,8 @@ ci-finmap-dev:
   image: docker:latest
   services:
     - docker:dind
+  variables:
+    GIT_STRATEGY: none
   environment:
     name: deployment
     url: https://hub.docker.com/r/mathcomp/mathcomp-dev
-- 
cgit v1.2.3


From d5ac333d1ee1b4f3a8d38dc0238c661dcc4a89f7 Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel
Date: Tue, 30 Jul 2019 12:55:06 +0200
Subject: [ci] Add jobs {ci-fourcolor-8.9, ci-odd-order-8.9}

* Add {fourcolor, odd-order} test builds with latest Coq release (8.9)

* As a result, the math-comp CI config w.r.t. {fourcolor, odd-order}
  will be similar to that of the upstream repos:
  - https://github.com/math-comp/fourcolor/blob/master/.travis.yml
  - https://github.com/math-comp/odd-order/pull/16
---
 .gitlab-ci.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81c7b7e..f66232e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,6 +143,11 @@ ci-fourcolor-8.8:
   variables:
     COQ_VERSION: "8.8"
 
+ci-fourcolor-8.9:
+  extends: .ci-fourcolor
+  variables:
+    COQ_VERSION: "8.9"
+
 ci-fourcolor-dev:
   extends: .ci-fourcolor
   variables:
@@ -168,6 +173,11 @@ ci-odd-order-8.8:
   variables:
     COQ_VERSION: "8.8"
 
+ci-odd-order-8.9:
+  extends: .ci-odd-order
+  variables:
+    COQ_VERSION: "8.9"
+
 ci-odd-order-dev:
   extends: .ci-odd-order
   variables:
-- 
cgit v1.2.3


From 5bccaf10977a1cb86e00fc2e986bfbe1ac86ad1b Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel
Date: Tue, 30 Jul 2019 16:49:28 +0200
Subject: [ci] Adapt the GitLab CI config to allow scheduled builds for coq-dev

* Normal builds (branches & GitHub PRs) are not impacted

* Triggering a scheduled pipeline will only run {coq-dev, mathcomp-dev:coq-dev}
  to build and deploy the corresponding image to mathcomp/mathcomp-dev:coq-dev.

* href: https://docs.gitlab.com/ce/user/project/pipelines/schedules.html
---
 .gitlab-ci.yml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f66232e..5000e5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,12 @@
 #     (Dockerfile containing: "opam switch set $compiler && eval $(opam env)")
 #   - all branches (not tags) => push on GitLab registry
 #   - GitHub PRs => push on GitLab and report back thanks to @coqbot
-# - test stage (image: mathcomp-dev:$IID_$SLUG_coq-8.6)
+# - test stage (image: mathcomp-dev:$IID_$SLUG_coq-8.7)
 #   - script template foreach project (custom CONTRIB_URL, script)
 #   - jobs foreach project and Coq version (custom COQ_VERSION, CONTRIB_VERSION)
 # - deploy stage (only branch "master" and environment "deployment")
 #   - pull each built image from GitLab registry => push to Docker Hub
+# + scheduled build & deploy for mathcomp/mathcomp-dev:coq-dev
 #
 # Config for protected environment "deployment":
 # - set vars HUB_REGISTRY, HUB_REGISTRY_USER, HUB_REGISTRY_IMAGE, HUB_TOKEN
@@ -51,6 +52,7 @@ stages:
   except:
     - tags
     - merge_requests
+    - schedules
 
 make-coq-latest:
   extends: .make-build
@@ -77,14 +79,19 @@ make-coq-latest:
     - tags
     - merge_requests
 
-coq-8.7:
+.opam-build-once:
   extends: .opam-build
+  except:
+    - schedules
+  
+coq-8.7:
+  extends: .opam-build-once
 
 coq-8.8:
-  extends: .opam-build
+  extends: .opam-build-once
 
 coq-8.9:
-  extends: .opam-build
+  extends: .opam-build-once
 
 coq-dev:
   extends: .opam-build
@@ -116,6 +123,7 @@ coq-dev:
   except:
     - tags
     - merge_requests
+    - schedules
 
 # Guidelines to add a library to mathcomp CI:
 # - Add a hidden job (starting with a .) .ci-lib that extends the .ci job,
@@ -359,14 +367,19 @@ ci-finmap-dev:
   only:
     - master
 
-mathcomp-dev:coq-8.7:
+.docker-deploy-once:
   extends: .docker-deploy
+  except:
+    - schedules
+
+mathcomp-dev:coq-8.7:
+  extends: .docker-deploy-once
 
 mathcomp-dev:coq-8.8:
-  extends: .docker-deploy
+  extends: .docker-deploy-once
 
 mathcomp-dev:coq-8.9:
-  extends: .docker-deploy
+  extends: .docker-deploy-once
 
 mathcomp-dev:coq-dev:
   extends: .docker-deploy
-- 
cgit v1.2.3