Skip to content

Commit 4373783

Browse files
authored
Fix version on refmt (#2701)
1 parent 0c763cd commit 4373783

File tree

102 files changed

+1315
-4530
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1315
-4530
lines changed

Makefile

+2-16
Original file line numberDiff line numberDiff line change
@@ -50,30 +50,16 @@ clean-for-ci: clean-tests
5050

5151
.PHONY: build clean
5252

53-
ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
54-
SUBSTS:=$(ROOT_DIR)/pkg/substs
55-
5653
# For publishing esy releases to npm
57-
esy-prepublish: build clean-tests pre_release
54+
esy-prepublish: build clean-tests
5855
node ./scripts/esy-prepublish.js
5956

60-
# For OPAM
61-
pre_release:
62-
ifndef version
63-
$(error environment variable 'version' is undefined)
64-
endif
65-
export git_version="$(shell git rev-parse --verify HEAD)"; \
66-
export git_short_version="$(shell git rev-parse --short HEAD)"; \
67-
$(SUBSTS) $(ROOT_DIR)/src/refmt/package.ml.in
68-
69-
.PHONY: pre_release
70-
7157
# For OPAM
7258
release_check:
7359
./scripts/release-check.sh
7460

7561
# For OPAM
76-
release: release_check pre_release
62+
release: release_check
7763
git add package.json src/refmt/package.ml reason.opam
7864
git commit -m "Version $(version)"
7965
git tag -a $(version) -m "Version $(version)."

dune-project

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33

44
(using menhir 2.0)
55
(cram enable)
6+
7+
(version 3.8.2)

esy.json

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
"notes":
44
"This is just the dev package config (also built as globally installable reason-cli). See ./refmt.json ./rtop.json for individual release package configs.",
55
"license": "MIT",
6-
"version": "3.8.1",
6+
"version": "3.8.2",
77
"dependencies": {
8-
"@opam/dune": "3.6.2",
8+
"@opam/dune": "> 3.0.0",
9+
"@opam/dune-build-info": "> 3.0.0",
910
"@opam/fix": "*",
1011
"@opam/menhir": " >= 20180523.0.0",
1112
"@opam/merlin-extend": " >= 0.6",
@@ -14,7 +15,11 @@
1415
"@opam/utop": " >= 1.17.0",
1516
"ocaml": " >= 4.3.0 < 4.15.0"
1617
},
17-
"devDependencies": { "@opam/odoc": "*", "ocaml": "~4.14.0" },
18+
"devDependencies": {
19+
"@opam/ocaml-lsp-server": "1.15.1-4.14",
20+
"@opam/odoc": "*",
21+
"ocaml": "~4.14.0"
22+
},
1823
"notes-ctd": [
1924
"This is how you make an esy monorepo for development, but then release the monorepo as many individual packages:",
2025
"1. Create a packageName-dev esy.json at the root and list the sum of all dependencies",
@@ -36,7 +41,7 @@
3641
"SYSTEM_PULLREQUEST_MERGEDAT": { "scope": "global", "val": "d" }
3742
},
3843
"release": {
39-
"bin": ["rtop", "refmt"],
44+
"bin": [ "rtop", "refmt" ],
4045
"includePackages": [
4146
"root", "@opam/base-bytes", "@opam/base-threads", "@opam/base-unix",
4247
"@opam/camomile", "@opam/lambda-term", "@opam/lwt", "@opam/lwt_log",

0 commit comments

Comments
 (0)