Merge pull request #280 from pveber/use-ppxlib

use ppxlib
mirage · Sep 21, 2020 · 38ab8d0 · 38ab8d0
2 parents 00ff5aa + fe3c145
commit 38ab8d0
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 82 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,9 +37,27 @@ jobs:
         ocaml-version: ${{ matrix.ocaml-version }}
     - run: opam pin add -n .
     - name: Packages
-      run: opam depext -yt cstruct cstruct-sexp cstruct-unix cstruct-lwt ppx_cstruct
+      run: opam depext -yt cstruct cstruct-sexp cstruct-unix cstruct-lwt
     - name: Build
-      run: opam install -t cstruct cstruct-sexp cstruct-unix cstruct-lwt ppx_cstruct
+      run: opam install -t cstruct cstruct-sexp cstruct-unix cstruct-lwt
+  ppx:
+    name: PPX
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ocaml-version: [ '4.10.0', '4.08.1', '4.07.1' ]
+        operating-system: [macos-latest, ubuntu-latest, windows-latest]
+    steps:
+    - uses: actions/checkout@v2
+    - uses: avsm/setup-ocaml@v1
+      with:
+        ocaml-version: ${{ matrix.ocaml-version }}
+    - run: opam pin add -n .
+    - name: Packages
+      run: opam depext -yt ppx_cstruct
+    - name: Build
+      run: opam install -t ppx_cstruct
   async:
     name: Async
     runs-on: ${{ matrix.operating-system }}

diff --git a/ppx/dune b/ppx/dune
@@ -4,7 +4,5 @@
  (kind ppx_rewriter)
  (wrapped false)
  (ppx_runtime_libraries cstruct stdlib-shims)
- (preprocess
-  (pps ppx_tools_versioned.metaquot_411))
- (libraries sexplib ocaml-migrate-parsetree ppx_tools_versioned
-   ppx_tools_versioned.metaquot_411 bigarray stdlib-shims))
+ (preprocess (pps ppxlib.metaquot))
+ (libraries sexplib ppxlib bigarray stdlib-shims))