diff options
| author | Michael Soegtrop | 2018-10-05 11:39:22 +0200 |
|---|---|---|
| committer | Michael Soegtrop | 2018-10-05 14:07:06 +0200 |
| commit | 4bd1bb0091d2e69637444b776f6025a4b1c049b7 (patch) | |
| tree | 31dcfe0bef30f8bfa1c4ae62321d39e6de16832d /dev | |
| parent | d3bfed08d0e53e953fca996e72adf0dc4f132f98 (diff) | |
Fix issue #8659 - Not always build extended set of addons for Windows installer
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ci/README.md | 5 | ||||
| -rwxr-xr-x | dev/ci/gitlab.bat | 28 |
2 files changed, 22 insertions, 11 deletions
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
|