Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix version on refmt #2701

Merged
merged 10 commits into from
Mar 26, 2023
Merged

Fix version on refmt #2701

merged 10 commits into from
Mar 26, 2023

Conversation

davesnx
Copy link
Member

@davesnx davesnx commented Mar 21, 2023

This PR is a step close to solve the issue with the release process being broken.
Fixing the version on running refmt --version

This would always print the version from dune-project which would need to be in sync with reason.json, package.json, esy.json which is not ideal.

  • Using build_info from dune to display version (defined in dune-project)
  • Using dune rule to get the commit hash and write it to git_commit.ml
  • Remove pre-release on Makefile
  • Set ocaml to 4.14 and ocaml-lsp to 1.15 for development

In the future the publish is going to be automated by CI, only updating the version on the dune-project file will propagate to all releases.

@davesnx davesnx mentioned this pull request Mar 24, 2023
esy.json Outdated
@@ -3,9 +3,10 @@
"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",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should probably be on the same dune version as dune-build-info

reason.json Outdated
@@ -15,7 +15,8 @@
"@opam/merlin-extend": " >= 0.6",
"@opam/result": "*",
"@opam/ppx_derivers": "< 2.0.0",
"@opam/dune": "2.9.3"
"@opam/dune": "2.9.3",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's try to use the same dune version across all .json files.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated in 22e86a6 + update reason.json/rtop.json

@davesnx davesnx force-pushed the Fix-version-on-refmt branch from 46841b1 to 2447429 Compare March 24, 2023 22:59
davesnx added 3 commits March 25, 2023 01:08
…-on-refmt

* 'master' of github.com:/reasonml/reason:
  Remove old CI and test.sh (#2705)
…-on-refmt

* 'master' of github.com:/reasonml/reason:
  Drop the result dependency (#2703)
@davesnx davesnx merged commit 4373783 into master Mar 26, 2023
@davesnx davesnx deleted the Fix-version-on-refmt branch March 26, 2023 14:30
SanderSpies added a commit to SanderSpies/reason that referenced this pull request Apr 18, 2023
* master: (38 commits)
  chore: remove old BS_NO_COMPILER_PATCH flag (reasonml#2710)
  Improve printing of modules types with one line inside (reasonml#2709)
  generate opam files with dune (reasonml#2704)
  Fix version on refmt (reasonml#2701)
  Drop the result dependency (reasonml#2703)
  Remove old CI and test.sh (reasonml#2705)
  Migrate tests to cram suite (reasonml#2694)
  Make sure win doesnt break when importing (reasonml#2700)
  Fix top level extensions (reasonml#2693)
  Install before importing deps
  Update package json and install esy normally
  Re-arrange esy install
  Reduce install esy time
  Use master branch instead of main
  Ignore _export from esy
  Rename refmt_test to test
  Add esy-ci and opam-ci
  Remove jbuild-ignore
  chore: update nix flake (reasonml#2692)
  chore(readme): clarify 3.9 is unreleased
  ...
SanderSpies added a commit to SanderSpies/reason that referenced this pull request Apr 18, 2023
* master: (38 commits)
  chore: remove old BS_NO_COMPILER_PATCH flag (reasonml#2710)
  Improve printing of modules types with one line inside (reasonml#2709)
  generate opam files with dune (reasonml#2704)
  Fix version on refmt (reasonml#2701)
  Drop the result dependency (reasonml#2703)
  Remove old CI and test.sh (reasonml#2705)
  Migrate tests to cram suite (reasonml#2694)
  Make sure win doesnt break when importing (reasonml#2700)
  Fix top level extensions (reasonml#2693)
  Install before importing deps
  Update package json and install esy normally
  Re-arrange esy install
  Reduce install esy time
  Use master branch instead of main
  Ignore _export from esy
  Rename refmt_test to test
  Add esy-ci and opam-ci
  Remove jbuild-ignore
  chore: update nix flake (reasonml#2692)
  chore(readme): clarify 3.9 is unreleased
  ...
davesnx added a commit that referenced this pull request Apr 25, 2023
* 'master' of github.com:/reasonml/reason:
  Fix version on refmt (#2701)
  Drop the result dependency (#2703)
  Remove old CI and test.sh (#2705)
SanderSpies added a commit to SanderSpies/reason that referenced this pull request May 4, 2023
* master:
  fix: binary parser (reasonml#2713)
  Improve functor printing. (reasonml#2683)
  chore: remove old BS_NO_COMPILER_PATCH flag (reasonml#2710)
  Improve printing of modules types with one line inside (reasonml#2709)
  generate opam files with dune (reasonml#2704)
  Fix version on refmt (reasonml#2701)
  Drop the result dependency (reasonml#2703)
  Remove old CI and test.sh (reasonml#2705)
  Migrate tests to cram suite (reasonml#2694)
  Make sure win doesnt break when importing (reasonml#2700)
  Fix top level extensions (reasonml#2693)
  Install before importing deps
  Update package json and install esy normally
  Re-arrange esy install
  Reduce install esy time
  Use master branch instead of main
  Ignore _export from esy
  Rename refmt_test to test
  Add esy-ci and opam-ci
  Remove jbuild-ignore
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants