Skip to content

Commit

Permalink
Merge pull request #453 from samoht/release
Browse files Browse the repository at this point in the history
Prepare the release
  • Loading branch information
samoht authored Jun 6, 2017
2 parents d86350e + 741646c commit 3801feb
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
global:
- ALCOTEST_SHOW_ERRORS=1
- REVDEPS="irmin-indexeddb"
- PINS="irmin.dev:. irmin-mem.dev:. irmin-fs.dev:. irmin-http.dev:. irmin-git.dev:. irmin-mirage.dev:. irmin-unix.dev:. git.dev:--dev git-http.dev:--dev git-mirage.dev:--dev git-unix.dev:--dev"
- PINS="irmin.dev:. irmin-mem.dev:. irmin-fs.dev:. irmin-http.dev:. irmin-git.dev:. irmin-mirage.dev:. irmin-unix.dev:."
matrix:
- OCAML_VERSION=4.03 PACKAGE="irmin-fs.dev" TESTS=true
- OCAML_VERSION=4.04 PACKAGE="irmin-mem.dev" TESTS=true
Expand Down
32 changes: 32 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
### 1.2.0 (2017-06-06)

This release changes the build system to use
[jbuilder](https://github.com/janestreet/jbuilder). By doing so, it introduces
two new packages: `irmin-mem` and `irmin-fs` -- containing `Irmin_mem` and
`Irmin_fs` respectively. That release also fixes a bunch of regressions
introduced in the big 1.0 rewrite.

**all**

- Use `jbuilder` (#444, @samoht)
- Use mtime 1.0 (#445, @samoht)

**irmin**

- Fix `Irmin.Contents.Cstruct`: pretty-print the raw contents, not the hexdump
(#442, @samoht)
- `Irmin.Hash.X.of_string` should not raise an exception on invalid hash
(#443, @samoht)

**irmin-mem**

- New package! Use it if you want to use the `Irmin_mem` module.

**irmin-fs**

- New package! Use it if you want to use the `Irmin_fs` module.

**irmin-git**

- Fix watches (#446, @samoht)

### 1.1.0 (2017-04-24)

**irmin**
Expand Down
6 changes: 3 additions & 3 deletions irmin-git.opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ build-test: ["jbuilder" "runtest" "test/irmin-git"]

depends: [
"jbuilder" {build}
"irmin" {>= "1.1.0"}
"git" {>= "1.10.0"}
"irmin" {>= "1.2.0"}
"git" {>= "1.11.0"}
"alcotest" {test}
"git-unix" {test & >= "1.10.0"}
"git-unix" {test & >= "1.11.0"}
"mtime" {test & >= "1.0.0"}
]

Expand Down
4 changes: 2 additions & 2 deletions irmin-http.opam
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ depends: [
"jbuilder" {build}
"crunch"
"webmachine" {>= "0.3.2"}
"irmin" {>= "1.0.0"}
"irmin" {>= "1.2.0"}
"cohttp" {>= "0.18.3"}
"irmin-git" {test & >= "1.0.0"}
"irmin-git" {test & >= "1.2.0"}
"alcotest" {test}
"mtime" {test & >= "1.0.0"}
]
Expand Down
6 changes: 3 additions & 3 deletions irmin-mirage.opam
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ build: ["jbuilder" "build" "-p" name "-j" jobs]

depends: [
"jbuilder" {build}
"irmin" {>= "1.1.0"}
"irmin-git" {>= "1.1.0"}
"irmin" {>= "1.2.0"}
"irmin-git" {>= "1.2.0"}
"irmin-mem" {>= "1.2.0"}
"git-mirage" {>= "1.10.0"}
"git-mirage" {>= "1.11.0"}
"ptime"
"mirage-kv-lwt"
"mirage-clock"
Expand Down
10 changes: 5 additions & 5 deletions irmin-unix.opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ build-test: ["jbuilder" "runtest" "test/irmin-unix"]

depends: [
"jbuilder" {build}
"irmin" {>= "1.1.0"}
"irmin-git" {>= "1.1.0"}
"irmin-http" {>= "1.1.0"}
"irmin" {>= "1.2.0"}
"irmin-git" {>= "1.2.0"}
"irmin-http" {>= "1.2.0"}
"irmin-fs" {>= "1.2.0"}
"git-unix" {>= "1.10.0"}
"git-unix" {>= "1.11.0"}
"irmin-watcher" {>= "0.2.0"}
"irmin-mirage" {test & >= "1.0.0"}
"irmin-mirage" {test & >= "1.2.0"}
"alcotest" {test}
"mtime" {test & >= "1.0.0"}
]
Expand Down

0 comments on commit 3801feb

Please sign in to comment.