From 4bd1bb0091d2e69637444b776f6025a4b1c049b7 Mon Sep 17 00:00:00 2001
From: Michael Soegtrop
Date: Fri, 5 Oct 2018 11:39:22 +0200
Subject: Fix issue #8659 - Not always build extended set of addons for Windows
 installer

---
 dev/ci/README.md  |  5 +++++
 dev/ci/gitlab.bat | 28 +++++++++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'dev')

diff --git a/dev/ci/README.md b/dev/ci/README.md
index 24952eb5b7..47ce0cb060 100644
--- a/dev/ci/README.md
+++ b/dev/ci/README.md
@@ -178,6 +178,11 @@ versions of Coq (32bit and 64bit).
 The Windows jobs are enabled on Coq's repository, where pipelines for
 pull requests run.
 
+If the additional secret variable `WINDOWS_ALL_ADDONS` is set to `enabled`,
+an extended set of addons will be added to the Windows installer.
+This leads to a considerable runtime in CI and is disabled by default for
+pipelines for pull requests.
+
 ### GitLab and Docker
 
 System and opam packages are installed in a Docker image. The image is
diff --git a/dev/ci/gitlab.bat b/dev/ci/gitlab.bat
index deda42e2b7..c7a32fd4d2 100755
--- a/dev/ci/gitlab.bat
+++ b/dev/ci/gitlab.bat
@@ -40,6 +40,22 @@ SET PATH=%PATH%;C:\Program Files\7-Zip\;C:\Program Files\Microsoft SDKs\Windows\
 if exist %CYGROOT%\build\ rd /s /q %CYGROOT%\build
 if exist %DESTCOQ%\ rd /s /q %DESTCOQ%
 
+IF "%WINDOWS_ALL_ADDONS%" == "enabled" (
+  SET EXTRA_ADDONS=^
+    -addon=mathcomp ^
+    -addon=menhir ^
+    -addon=menhirlib ^
+    -addon=compcert ^
+    -addon=extlib ^
+    -addon=quickchick ^
+    -addon=coquelicot
+  REM addons with build issues
+  REM -addon=vst ^
+  REM -addon=aactactics ^
+) ELSE (
+  SET "EXTRA_ADDONS= "
+)
+
 call %CI_PROJECT_DIR%\dev\build\windows\MakeCoq_MinGW.bat -threads=1 ^
   -arch=%ARCH% -installer=Y -coqver=%CI_PROJECT_DIR_CFMT% ^
   -destcyg=%CYGROOT% -destcoq=%DESTCOQ% -cygcache=%CYGCACHE% ^
@@ -47,20 +63,10 @@ call %CI_PROJECT_DIR%\dev\build\windows\MakeCoq_MinGW.bat -threads=1 ^
   -addon=equations ^
   -addon=ltac2 ^
   -addon=mtac2 ^
-  -addon=mathcomp ^
-  -addon=menhir ^
-  -addon=menhirlib ^
-  -addon=compcert ^
-  -addon=extlib ^
-  -addon=quickchick ^
-  -addon=coquelicot ^
+  %EXTRA_ADDONS% ^
   -make=N ^
   -setup %CI_PROJECT_DIR%\%SETUP% || GOTO ErrorCopyLogFilesAndExit
 
-REM addons with build issues
-REM -addon=vst ^
-REM -addon=aactactics ^
-
 ECHO "Start Artifact Creation"
 TIME /T
 
-- 
cgit v1.2.3


From 7bbaefad7ae6c66a74a648b118d4b4c40ee95800 Mon Sep 17 00:00:00 2001
From: Michael Soegtrop
Date: Fri, 5 Oct 2018 11:40:45 +0200
Subject: Remove old folder delete (can interfere with unique folder creation)

---
 dev/ci/gitlab.bat | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'dev')

diff --git a/dev/ci/gitlab.bat b/dev/ci/gitlab.bat
index c7a32fd4d2..f6fe0dbb2b 100755
--- a/dev/ci/gitlab.bat
+++ b/dev/ci/gitlab.bat
@@ -37,9 +37,6 @@ SET CI_PROJECT_DIR_CFMT=%CI_PROJECT_DIR_MFMT:C:/=/cygdrive/c/%
 SET COQREGTESTING=Y
 SET PATH=%PATH%;C:\Program Files\7-Zip\;C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin
 
-if exist %CYGROOT%\build\ rd /s /q %CYGROOT%\build
-if exist %DESTCOQ%\ rd /s /q %DESTCOQ%
-
 IF "%WINDOWS_ALL_ADDONS%" == "enabled" (
   SET EXTRA_ADDONS=^
     -addon=mathcomp ^
-- 
cgit v1.2.3


From 6c67fa52300546bb1e87bdb72e5373ab163c23ec Mon Sep 17 00:00:00 2001
From: Michael Soegtrop
Date: Fri, 5 Oct 2018 14:06:27 +0200
Subject: Fix review requests

---
 dev/ci/README.md  | 10 +++++-----
 dev/ci/gitlab.bat |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'dev')

diff --git a/dev/ci/README.md b/dev/ci/README.md
index 47ce0cb060..1c098e5f46 100644
--- a/dev/ci/README.md
+++ b/dev/ci/README.md
@@ -175,14 +175,14 @@ If your repository has access to runners tagged `windows`, setting the
 secret variable `WINDOWS` to `enabled` will add jobs building Windows
 versions of Coq (32bit and 64bit).
 
+If the secret variable `WINDOWS` is set to `enabled_all_addons`,
+an extended set of addons will be added to the Windows installer.
+This leads to a considerable runtime in CI so this is not enabled
+by default for pipelines for pull requests.
+
 The Windows jobs are enabled on Coq's repository, where pipelines for
 pull requests run.
 
-If the additional secret variable `WINDOWS_ALL_ADDONS` is set to `enabled`,
-an extended set of addons will be added to the Windows installer.
-This leads to a considerable runtime in CI and is disabled by default for
-pipelines for pull requests.
-
 ### GitLab and Docker
 
 System and opam packages are installed in a Docker image. The image is
diff --git a/dev/ci/gitlab.bat b/dev/ci/gitlab.bat
index f6fe0dbb2b..918d289ae2 100755
--- a/dev/ci/gitlab.bat
+++ b/dev/ci/gitlab.bat
@@ -37,7 +37,7 @@ SET CI_PROJECT_DIR_CFMT=%CI_PROJECT_DIR_MFMT:C:/=/cygdrive/c/%
 SET COQREGTESTING=Y
 SET PATH=%PATH%;C:\Program Files\7-Zip\;C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin
 
-IF "%WINDOWS_ALL_ADDONS%" == "enabled" (
+IF "%WINDOWS%" == "enabled_all_addons" (
   SET EXTRA_ADDONS=^
     -addon=mathcomp ^
     -addon=menhir ^
-- 
cgit v1.2.3