Skip to content

Commit

Permalink
Update to cmdlang.0.0.4 and prepare 0.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
mbarbin committed Sep 7, 2024
1 parent be73fb7 commit 89bd9de
Show file tree
Hide file tree
Showing 52 changed files with 254 additions and 292 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
# janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages

- name: Install dependencies
run: opam install . --deps-only --with-doc --with-test
run: opam install . --deps-only --with-doc --with-test --with-dev-setup

- name: Build
run: opam exec -- dune build @all @lint
Expand Down
16 changes: 6 additions & 10 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
## 0.0.6 (unreleased)

### Added
## 0.0.6 (2024-09-07)

### Changed

- Upgrade to `cmdlang.0.0.4`.
- Use type `Msg of string` for `of_string` errors.
- Now using `expect_test_helpers_base`.
- Upgrade to `err0` and more recent `commandlang`.

### Deprecated

### Fixed
- Upgrade to `err0` and more recent `cmdlang`.

### Removed

Expand All @@ -19,8 +15,8 @@

### Changed

- Renamed `vcs_param` to `vcs_arg` to match commandlang conventions.
- Switch commands to new library `commandlang` with `cmdliner` backend.
- Renamed `vcs_param` to `vcs_arg` to match cmdlang conventions.
- Switch commands to new library `cmdlang` with `cmdliner` backend.
- Upgrade `provider` to `0.0.8`.

## 0.0.4 (2024-08-05)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ lint:

.PHONY: deps
deps:
opam install . --deps-only --with-doc --with-test
opam install . --deps-only --with-doc --with-test --with-dev-setup

.PHONY: doc
doc:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ cd vcs
opam switch create . 5.2.0 --no-install
eval $(opam env)
opam repo add mbarbin https://github.com/mbarbin/opam-repository.git
opam install . --deps-only --with-test --with-doc
opam install . --deps-only --with-doc --with-test --with-dev-setup
```

Once this is setup, you can build with dune:
Expand Down
2 changes: 1 addition & 1 deletion bin/dune
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
(public_name ocaml-vcs)
(package vcs-command)
(flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a)
(libraries commandlang-to-cmdliner err0 vcs-command)
(libraries cmdlang-to-cmdliner err vcs-command)
(instrumentation
(backend bisect_ppx)))
4 changes: 2 additions & 2 deletions bin/main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
(*******************************************************************************)

let () =
Commandlang_to_cmdliner.run
Cmdlang_to_cmdliner.run
Vcs_command.main
~name:"ocaml-vcs"
~version:"%%VERSION%%"
~exn_handler:(function
| Vcs.E e -> Some (Err0.Err.make [ Err0.Err.pp_of_sexp (Vcs.Err.sexp_of_t e) ])
| Vcs.E e -> Some (Err.create [ Err.pp_of_sexp (Vcs.Err.sexp_of_t e) ])
| _ -> None [@coverage off])
;;
1 change: 1 addition & 0 deletions doc/docs/tests/dune
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
(mdx
(package vcs-tests)
(deps
(package vcs)
(package vcs-command))
Expand Down
Loading

0 comments on commit 89bd9de

Please sign in to comment.