From ab98d847d237af3cd0e46edef42218be65cfc98f Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Mon, 22 Jun 2020 17:52:18 +0200
Subject: [build] Split stdlib to it's own opam package.

We introduce a new package structure for Coq:

- `coq-core`: Coq's OCaml tools code and plugins
- `coq-stdlib`: Coq's stdlib [.vo files]
- `coq`: meta-package that pulls `coq-{core,stdlib}`

This has several advantages, in particular it allows to install Coq
without the stdlib which is useful in several scenarios, it also open
the door towards a versioning of the stdlib at the package level.

The main user-visible change is that Coq's ML development files now
live in `$lib/coq-core`, for compatibility in the regular build we
install a symlink and support both setups for a while.

Note that plugin developers and even `coq_makefile` should actually
rely on `ocamlfind` to locate Coq's OCaml libs as to be more robust.

There is a transient state where we actually look for both
`$coqlib/plugins` and `$coqlib/../coq-core/plugins` as to support
the non-ocamlfind plus custom variables.

This will be much improved once #13617 is merged (which requires this
PR first), then, we will introduce a `coq.boot` library so finally
`coqdep`, `coqchk`, etc... can share the same path setup code.

IMHO the plan should work fine.
---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f5527192e0..7ec3ba1bd7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,18 +63,18 @@ jobs:
           MACOSX_DEPLOYMENT_TARGET: "10.11"
           NJOBS: "2"
 
+      - name: Install Coq
+        run: |
+          make install install-byte
+
       - name: Run Coq Test Suite
         run: |
           eval $(opam env)
-          export OCAMLPATH=$(pwd):"$OCAMLPATH"
+          export OCAMLPATH="$(pwd)/_install_ci/lib":"$OCAMLPATH"
           make -j "$NJOBS" test-suite PRINT_LOGS=1
         env:
           NJOBS: "2"
 
-      - name: Install Coq
-        run: |
-          make install
-
       - name: Create the dmg bundle
         run: |
           eval $(opam env)
-- 
cgit v1.2.3