Skip to content

Commit

Permalink
prepare for release (#133)
Browse files Browse the repository at this point in the history
  • Loading branch information
anuragsoni authored Aug 17, 2021
1 parent c216197 commit b9bb8a0
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-ml/setup-ocaml@master
- uses: ocaml/setup-ocaml@v2
with:
ocaml-version: 4.12.x
ocaml-compiler: 4.12.x
dune-cache: true
opam-depext: false
opam-depext-flags: --with-test
- name: Install dependencies
run: |
opam pin add routes.dev -n .
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-ml/setup-ocaml@master
- uses: ocaml/setup-ocaml@v2
with:
ocaml-version: 4.12.x
ocaml-compiler: 4.12.x
dune-cache: true
opam-depext: false
opam-depext-flags: --with-test
- name: Install dependencies
run: opam install dune ocamlformat.0.18.0
run: opam install dune ocamlformat.0.19.0
- name: Format
run: opam exec -- dune build @fmt --auto-promote || true
- name: Create Pull Request
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup OCaml ${{ matrix.ocaml-version }}
uses: actions-ml/setup-ocaml@master
uses: ocaml/setup-ocaml@v2
with:
ocaml-version: ${{ matrix.ocaml-version }}
ocaml-compiler: ${{ matrix.ocaml-version }}
dune-cache: ${{ matrix.operating-system == 'ubuntu-latest' }}
opam-depext: false
opam-depext-flags: --with-test
- name: Install dependencies
run: |
opam pin add routes.dev -n .
Expand Down
2 changes: 1 addition & 1 deletion .ocamlformat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=0.18.0
version=0.19.0
profile=janestreet
parse-docstrings=true
wrap-comments=true
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 1.0.0

* First major release. No changes from 0.9.1

# 0.9.1

* bucklescript: Use correct version number (0.9.1) in package.json
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@anuragsoni/routes",
"version": "0.9.1",
"version": "1.0.0",
"description": "Typed bidirectional routing for OCaml/ReasonML web applications",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions src/routes.ml
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ let ksprintf' k { slash_kind; path } =
fun k -> function
| End -> k trail
| Wildcard -> fun { Parts.matched; _ } -> k (List.concat [ matched; trail ])
| Match (w, fmt) -> aux (fun s -> k @@ w :: s) fmt
| Conv ({ to_; _ }, fmt) -> fun x -> aux (fun rest -> k @@ to_ x :: rest) fmt
| Match (w, fmt) -> aux (fun s -> k @@ (w :: s)) fmt
| Conv ({ to_; _ }, fmt) -> fun x -> aux (fun rest -> k @@ (to_ x :: rest)) fmt
in
aux k path
;;
Expand Down

0 comments on commit b9bb8a0

Please sign in to comment.