Merge remote-tracking branch 'refs/remotes/origin/master'

Author: fblanqui

.github/workflows/main.yml

@@ -4,40 +4,22 @@ on:
   push:
   workflow_dispatch:
 jobs:
-  lambdapi:
+  build:
     strategy:
       fail-fast: false
       matrix:
-        lambdapi-version: [2.0.0, 2.1.0, 2.2.0]
+        lambdapi-version: [lambdapi.2.0.0, lambdapi.2.1.0, lambdapi.2.2.0, lambdapi]
     runs-on: ubuntu-latest
     steps:
       - name: Check out library
         uses: actions/checkout@v2
       - name: Install ocaml and opam
         uses: ocaml/setup-ocaml@v2
-        with:
-          ocaml-compiler: 4.13.1
-      - name: Install lambdapi ${{ matrix.lambdapi-version }}
-        run: opam install lambdapi.${{ matrix.lambdapi-version }}
-      - name: Check library
-        run: |
-          eval $(opam env)
-          make
-  lambdapi-master:
-    strategy:
-      fail-fast: false
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out library
-        uses: actions/checkout@v2
-      - name: Install ocaml and opam
-        uses: ocaml/setup-ocaml@v2
-        with:
-          ocaml-compiler: 4.13.1
-      - name: Install lambdapi
-        run: |
-          opam pin add lambdapi https://github.com/Deducteam/lambdapi.git
-          opam install lambdapi
+      - name: Setup opam for testing the development version
+        run: opam pin -n --dev-repo lambdapi
+        if: matrix.lambdapi-version == 'lambdapi'
+      - name: Install ${{ matrix.lambdapi-version }}
+        run: opam install ${{ matrix.lambdapi-version }}
       - name: Check library
         run: |
           eval $(opam env)

blanqui-lib.opam

@@ -0,0 +1,26 @@
+opam-version: "2.0"
+synopsis: "Standard library for Lambdapi"
+description: """
+This package provides a Lambdapi library on natural numbers
+and polymorphic lists (in intuitionistic first-order logic).
+It provides the following modules:
+- Set: type of set codes
+- Prop: definition of propositional logic
+- Eq: definition of Leibniz equality
+- FOL: definition of first-order logic
+- Bool: definition of booleans
+- Nat: definition and properties of natural numbers
+- List: definition and properties of polymorphic lists
+- NatBool: some boolean functions on natural numbers
+"""
+maintainer: ["frederic.blanqui@inria.fr"]
+authors: ["Frédéric Blanqui"]
+license: "CECILL-2.1"
+homepage: "https://github.com/fblanqui/lib"
+bug-reports: "https://github.com/fblanqui/lib/issues"
+depends: [
+  "lambdapi" {>= "2.0.0"}
+]
+install: [ make "install" ]
+uninstall: [ make "uninstall" ]
+dev-repo: "git+https://github.com/fblanqui/lib.git"