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.

Sign up for GitHub

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

Jump to bottom

Update irmin to the last version of ocaml-git #1065

Merged
merged 7 commits into from
Jan 11, 2021
Merged

Update irmin to the last version of ocaml-git #1065

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55a5012
irmin-git: Update irmin-git to the last version of ocaml-git
dinosaure Jan 6, 2021
ed1af64
Delete useless comments
dinosaure Jan 7, 2021
e90e1cd
revert some modifications from dune-opam-lint
dinosaure Jan 7, 2021
d3ebe86
Add an entry into the CHANGES.md
dinosaure Jan 7, 2021
54a246e
Lint OPAM files according to the release of git.3.0.0
dinosaure Jan 11, 2021
61b5aef
Apply ocamlformat.0.16.0 on files
dinosaure Jan 11, 2021
e27a0c6
Revert a deletion of synopsis and description on irmin-unix.opam
dinosaure Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

### Fixed

- **irmin-git**
- Update `irmin` to the last version of `ocaml-git` (#1065)
It fixes an issue on serialization/deserialization of big tree object
(see #1001)

- **irmin-pack***
- Fix a major bug in the LRU which was never used (#1035, @samoht)

Expand Down
2 changes: 1 addition & 1 deletion examples/deploy.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ open Lwt.Infix
module Store = Irmin_unix.Git.FS.KV (Irmin.Contents.String)

let config =
let head = Store.Git.Reference.of_string "refs/heads/upstream" in
let head = Git.Reference.v "refs/heads/upstream" in
Irmin_git.config ~head ~bare:false Config.root

let info ~user msg () =
Expand Down
3 changes: 2 additions & 1 deletion examples/process.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ let images = [| (*ubuntu; *) wordpress; mysql |]

module Store = Irmin_unix.Git.FS.KV (Irmin.Contents.String)

let head = Store.Git.Reference.of_string ("refs/heads/" ^ branch images.(0))
let head = Git.Reference.v ("refs/heads/" ^ branch images.(0))

let config = Irmin_git.config ~bare:true ~head Config.root

let info image msg () =
Expand Down
5 changes: 3 additions & 2 deletions irmin-git.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ depends: [
"dune" {>= "2.7.0"}
"irmin" {= version}
"ppx_irmin" {= version}
"git" {>= "2.1.1"}
"git" {>= "3.0.0"}
"digestif" {>= "0.9.0"}
"cstruct"
"fmt"
Expand All @@ -27,9 +27,10 @@ depends: [
"logs"
"lwt"
"uri"
"git-cohttp-unix" {with-test}
"irmin-test" {with-test & = version}
"irmin-mem" {with-test & = version}
"git-unix" {with-test & >= "2.1.1"}
"git-unix" {with-test}
"mtime" {with-test & >= "1.0.0"}
"alcotest" {with-test}
]
Expand Down
2 changes: 1 addition & 1 deletion irmin-http.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ depends: [
"irmin-git" {with-test & = version}
"irmin-mem" {with-test & = version}
"irmin-test" {with-test & = version}
"git-unix" {with-test}
"git-unix" {with-test & >= "3.0.0"}
"digestif" {with-test & >= "0.9.0"}
]

Expand Down
4 changes: 2 additions & 2 deletions irmin-mirage-git.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ depends: [
"dune" {>= "2.7.0"}
"irmin-mirage" {= version}
"irmin-git" {= version}
"git-mirage" {>= "2.1.2"}
"mirage-kv" {>= "3.0.0"}
"cohttp"
"conduit-lwt"
"conduit-mirage"
"git-cohttp-mirage" {>= "3.0.0"}
"fmt"
"git"
"git" {>= "3.0.0"}
"lwt"
"mirage-clock"
"uri"
Expand Down
2 changes: 1 addition & 1 deletion irmin-mirage-graphql.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ depends: [
"dune" {>= "2.7.0"}
"irmin-mirage" {= version}
"irmin-graphql" {= version}
"git-mirage" {>= "2.1.1"}
"mirage-clock"
"cohttp-lwt"
"lwt"
"uri"
"git" {>= "3.0.0"}
]

synopsis: "MirageOS-compatible Irmin stores"
17 changes: 6 additions & 11 deletions irmin-unix.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ depends: [
"irmin-pack" {= version}
"irmin-graphql" {= version}
"irmin-layers" {= version}
"git-unix" {>= "1.11.4"}
"git-unix"
"digestif" {>= "0.9.0"}
"irmin-watcher" {>= "0.2.0"}
"yaml" {>= "0.1.0"}
"astring"
"astring"
"cohttp"
"cohttp-lwt"
"cohttp-lwt-unix"
"conduit"
"conduit-lwt"
"conduit-lwt-unix"
Expand All @@ -40,15 +41,9 @@ depends: [
"cmdliner"
"cohttp-lwt-unix"
"fmt"
"git"
"git" {>= "3.0.0"}
"git-cohttp-unix" {>= "3.0.0"}
"lwt"
"irmin-test" {with-test & = version}
"alcotest" {with-test}
"irmin-test" {with-test & = version}
"alcotest" {with-test}
]
dinosaure marked this conversation as resolved.
Show resolved Hide resolved

synopsis: "Unix backends for Irmin"
description: """
`Irmin_unix` defines Unix backends (including Git and HTTP) for Irmin, as well
as a very simple CLI tool (called `irmin`) to manipulate and inspect Irmin
stores.
"""
Loading