chore: remove dune pins (#593)

* chore: remove dune pins * add menhir to list of deps * consume reason-react from opam * mark 1.0.0
melange-re · May 31, 2023 · c989a91 · c989a91
1 parent 91a3bab
commit c989a91
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/esy-build.yml b/.github/workflows/esy-build.yml
@@ -48,7 +48,7 @@ jobs:
         if: ${{ matrix.system == 'ubuntu' }}
         run: |
           git clone https://github.com/melange-re/melange-basic-template.git
-          cd melange-basic-template
+          cd melange-basic-template && git checkout anmonteiro/1.0-release
 
       - name: Remove esy.lock in template
         if: ${{ matrix.system == 'ubuntu' }}
@@ -59,7 +59,7 @@ jobs:
         if: ${{ matrix.system == 'ubuntu' }}
         working-directory: melange-basic-template
         run: |
-          sed -i 's@"installConfig"@"resolutions": { "\@opam/dune": "ocaml/dune:dune.opam#a08e0f7f8a857b348267b30b10b9297ef881bb4d", "\@opam/reactjs-jsx-ppx": "melange-re/melange:reactjs-jsx-ppx.opam#'"$GITHUB_SHA"'","\@opam/melange": "melange-re/melange:melange.opam#'"$GITHUB_SHA"'"},"installConfig"@' esy.json
+          sed -i 's@"installConfig"@"resolutions": { "\@opam/reactjs-jsx-ppx": "melange-re/melange:reactjs-jsx-ppx.opam#'"$GITHUB_SHA"'","\@opam/melange": "melange-re/melange:melange.opam#'"$GITHUB_SHA"'", "\@opam/reason-react": "jchavarri/reason-react:reason-react.opam#27de44aed71ca4ccc902952e6a3203d663a23bcb"},"installConfig"@' esy.json
       - name: Build basic template
         if: ${{ matrix.system == 'ubuntu' }}
         working-directory: melange-basic-template

diff --git a/Changes.md b/Changes.md
@@ -1,4 +1,4 @@
-Unreleased
+1.0.0 2023-05-31
 ---------------
 
 - melange: print an error message if `$MELANGELIB` is set to a directory that

diff --git a/Makefile b/Makefile
@@ -29,7 +29,6 @@ opam-create-switch: ## Create opam switch
 
 .PHONY: opam-install-test
 opam-install-test: ## Install test dependencies
-	opam pin -y add dune.dev https://github.com/ocaml/dune.git#a08e0f7f8a857b348267b30b10b9297ef881bb4d
 	opam pin add reactjs-jsx-ppx.dev . --with-test -y
 	opam pin add melange.dev . --with-test -y
 	opam pin add rescript-syntax.dev . --with-test -y

diff --git a/dune-project b/dune-project
@@ -45,6 +45,7 @@
   (ounit :with-test)
   (reason :with-test)
   ppxlib
+  menhir
   (reactjs-jsx-ppx :with-test)))
 
 (package

diff --git a/melange.opam b/melange.opam
@@ -16,6 +16,7 @@ depends: [
   "ounit" {with-test}
   "reason" {with-test}
   "ppxlib"
+  "menhir"
   "reactjs-jsx-ppx" {with-test}
   "odoc" {with-doc}
 ]