diff options
author | 2018-04-28 15:34:42 +0200 | |
---|---|---|
committer | 2018-04-28 15:34:42 +0200 | |
commit | 75c144b25de008c85ff085761f80035a5a6278dd (patch) | |
tree | a59b83fa11e8d56d1eac9e4615eb921a1c71cb53 | |
parent | 7a5639a60b38e47238205ea78225544da2001b75 (diff) | |
parent | 2d76ac1779cc525c0c5903ec593801c709f11802 (diff) |
Merge PR #7357: [CI] elpi 1.0 has an official opam package
-rw-r--r-- | .circleci/config.yml | 2 | ||||
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | .travis.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index e24a9fc93..f811f26e1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -126,7 +126,7 @@ jobs: <<: *opam-boot-template environment: <<: *envvars - EXTRA_OPAM: "ocamlgraph ppx_tools_versioned ppx_deriving ocaml-migrate-parsetree" + EXTRA_OPAM: "ocamlgraph elpi" # Build and prepare test environment build: *build-template diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1c5b5255..7c5dea885 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ variables: COQDOC_PACKAGES: "texlive-latex-base texlive-latex-recommended texlive-latex-extra texlive-math-extra texlive-fonts-recommended texlive-fonts-extra latex-xcolor ghostscript transfig imagemagick tipa python3-pip" COQDOC_OPAM: "hevea" SPHINX_PACKAGES: "bs4 sphinx sphinx_rtd_theme pexpect antlr4-python3-runtime sphinxcontrib-bibtex" - ELPI_OPAM: "ppx_tools_versioned ppx_deriving ocaml-migrate-parsetree" + ELPI_OPAM: "elpi" before_script: diff --git a/.travis.yml b/.travis.yml index 052979bcb..dca326a20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,7 @@ matrix: - TEST_TARGET="ci-coquelicot" - if: NOT (type = pull_request) env: - - TEST_TARGET="ci-elpi" EXTRA_OPAM="ppx_tools_versioned ppx_deriving ocaml-migrate-parsetree" + - TEST_TARGET="ci-elpi" EXTRA_OPAM="elpi" # ppx_tools_versioned requires a specific version findlib - FINDLIB_VER="" - if: NOT (type = pull_request) |