Merge branch 'master' of github.com:/reasonml/reason

* 'master' of github.com:/reasonml/reason:
  Fix version on refmt (#2701)
  Drop the result dependency (#2703)
  Remove old CI and test.sh (#2705)

HISTORY.md

@@ -2,6 +2,8 @@
 
 - Fix missing patterns around contraint pattern (a pattern with a type annotation).
 - Fix top level extension printing
+- Remove the dependency on the `result` package, which isn't needed for OCaml
+  4.03 and above (@anmonteiro) [2703](https://github.com/reasonml/reason/pull/2703)
 
 ## 3.8.2
 

Makefile

@@ -50,30 +50,16 @@ clean-for-ci: clean-tests
 
 .PHONY: build clean
 
-ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-SUBSTS:=$(ROOT_DIR)/pkg/substs
-
 # For publishing esy releases to npm
-esy-prepublish: build clean-tests pre_release
+esy-prepublish: build clean-tests
 	node ./scripts/esy-prepublish.js
 
-# For OPAM
-pre_release:
-ifndef version
-	$(error environment variable 'version' is undefined)
-endif
-	export git_version="$(shell git rev-parse --verify HEAD)"; \
-	export git_short_version="$(shell git rev-parse --short HEAD)"; \
-	$(SUBSTS) $(ROOT_DIR)/src/refmt/package.ml.in
-
-.PHONY: pre_release
-
 # For OPAM
 release_check:
 	./scripts/release-check.sh
 
 # For OPAM
-release: release_check pre_release
+release: release_check
 	git add package.json src/refmt/package.ml reason.opam
 	git commit -m "Version $(version)"
 	git tag -a $(version) -m "Version $(version)."

dune-project

@@ -3,3 +3,5 @@
 
 (using menhir 2.0)
 (cram enable)
+
+(version 3.8.2)

esy.json

@@ -3,19 +3,23 @@
   "notes":
     "This is just the dev package config (also built as globally installable reason-cli). See ./refmt.json ./rtop.json for individual release package configs.",
   "license": "MIT",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "dependencies": {
-    "@opam/dune": "3.6.2",
+    "@opam/dune": "> 3.0.0",
+    "@opam/dune-build-info": "> 3.0.0",
     "@opam/fix": "*",
     "@opam/menhir": " >= 20180523.0.0",
     "@opam/merlin-extend": " >= 0.6",
     "@opam/ocamlfind": "1.9.5",
     "@opam/ppx_derivers": "< 2.0.0",
-    "@opam/result": "*",
     "@opam/utop": " >= 1.17.0",
-    "ocaml": " >= 4.2.0 < 4.15.0"
+    "ocaml": " >= 4.3.0 < 4.15.0"
+  },
+  "devDependencies": {
+    "@opam/ocaml-lsp-server": "1.15.1-4.14",
+    "@opam/odoc": "*",
+    "ocaml": "~4.14.0"
   },
-  "devDependencies": { "@opam/odoc": "*", "ocaml": "~4.12.0" },
   "notes-ctd": [
     "This is how you make an esy monorepo for development, but then release the monorepo as many individual packages:",
     "1. Create a packageName-dev esy.json at the root and list the sum of all dependencies",
@@ -25,7 +29,7 @@
     "5. Copy ./scripts/esy-prepublish.js in to your repo and change packages= to your set of packages."
   ],
   "esy": {
-    "build": [ [ "dune", "build", "-p", "reason,rtop" ] ],
+    "build": [ [ "dune", "build", "-p", "reason,rtop", "--disable-promotion" ] ],
     "install": [
       [ "esy-installer", "reason.install" ],
       [ "esy-installer", "rtop.install" ]
@@ -37,13 +41,13 @@
       "SYSTEM_PULLREQUEST_MERGEDAT": { "scope": "global", "val": "d" }
     },
     "release": {
-      "bin": ["rtop", "refmt"],
+      "bin": [ "rtop", "refmt" ],
       "includePackages": [
         "root", "@opam/base-bytes", "@opam/base-threads", "@opam/base-unix",
         "@opam/camomile", "@opam/lambda-term", "@opam/lwt", "@opam/lwt_log",
         "@opam/lwt_react", "@opam/menhir", "@opam/mmap",
         "@opam/ocplib-endian", "@opam/ocamlfind", "@opam/ppx_derivers",
-        "@opam/react", "@opam/result", "@opam/seq", "@opam/charInfo_width",
+        "@opam/react", "@opam/seq", "@opam/charInfo_width",
         "@opam/utop", "@opam/zed", "ocaml"
       ],
       "rewritePrefix": true