diff options
| author | Emilio Jesus Gallego Arias | 2018-03-31 00:49:22 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2018-03-31 00:49:22 +0200 |
| commit | 238e074cd1767b5ce12a733d8e835dd7d715c518 (patch) | |
| tree | b960d14e718ae03885442082de5590e12ae54ffc | |
| parent | c0eedb5bdcb815132f404e19d6bf59730ae6e2df (diff) | |
| parent | 7cec7d312831f509a2d63e89173395ee428f46fa (diff) | |
Merge PR #7130: gitlab: fix environment for build template
| -rw-r--r-- | .gitlab-ci.yml | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03e001f4a9..f0d7463fc9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,10 +85,6 @@ before_script: - echo 'end:coq.install' - set +e - variables: &build-variables - EXTRA_CONF: "-native-compiler yes -coqide opt" - EXTRA_PACKAGES: "$COQIDE_PACKAGES" - EXTRA_OPAM: "$COQIDE_OPAM" .warnings-template: &warnings-template # keep warnings in test stage so we can test things even when warnings occur @@ -151,9 +147,9 @@ before_script: build: <<: *build-template variables: - EXTRA_CONF: "-with-doc yes" - EXTRA_PACKAGES: "$COQDOC_PACKAGES" - EXTRA_OPAM: "$COQDOC_OPAM" + EXTRA_CONF: "-native-compiler yes -coqide opt -with-doc yes" + EXTRA_PACKAGES: "$COQIDE_PACKAGES $COQDOC_PACKAGES" + EXTRA_OPAM: "$COQIDE_OPAM $COQDOC_OPAM" PIP_PACKAGES: "$SPHINX_PACKAGES" # no coqide for 32bit: libgtk installation problems @@ -167,9 +163,10 @@ build:32bit: build:bleeding-edge: <<: *build-template variables: - <<: *build-variables + EXTRA_CONF: "-native-compiler yes -coqide opt" COMPILER: "$COMPILER_BLEEDING_EDGE" CAMLP5_VER: "$CAMLP5_VER_BLEEDING_EDGE" + EXTRA_PACKAGES: "$COQIDE_PACKAGES" EXTRA_OPAM: "$COQIDE_OPAM_BE" warnings: |