diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | dev/ci/README.md | 10 | ||||
| -rwxr-xr-x | dev/ci/gitlab.bat | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da90ebaa98..118482273d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -186,7 +186,7 @@ after_script: - call dev/ci/gitlab.bat only: variables: - - $WINDOWS == "enabled" + - $WINDOWS =~ /enabled/ build:base: <<: *build-template 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 ^
|