diff options
| author | Théo Zimmermann | 2018-10-08 15:04:25 +0200 |
|---|---|---|
| committer | Théo Zimmermann | 2018-10-08 15:04:25 +0200 |
| commit | 9a1cbeb18e10e7eb40363e648e15f4f9aae1f9b8 (patch) | |
| tree | d5989a42d847c181b7a3ba4c7a65709973576f59 /dev | |
| parent | 9c25908a3a766e07ed8f6f396c9197b0f924e0f8 (diff) | |
| parent | 6c67fa52300546bb1e87bdb72e5373ab163c23ec (diff) | |
Merge PR #8660: Issue 8659 not always build all addons
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ci/README.md | 5 | ||||
| -rwxr-xr-x | dev/ci/gitlab.bat | 29 |
2 files changed, 21 insertions, 13 deletions
diff --git a/dev/ci/README.md b/dev/ci/README.md index 7870cbb51d..7853866f62 100644 --- a/dev/ci/README.md +++ b/dev/ci/README.md @@ -175,6 +175,11 @@ 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. diff --git a/dev/ci/gitlab.bat b/dev/ci/gitlab.bat index deda42e2b7..918d289ae2 100755 --- a/dev/ci/gitlab.bat +++ b/dev/ci/gitlab.bat @@ -37,8 +37,21 @@ 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%" == "enabled_all_addons" (
+ 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% ^
@@ -47,20 +60,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
|