Skip to content

Commit

Permalink
Prepare for release
Browse files Browse the repository at this point in the history
  • Loading branch information
ulrikstrid committed Mar 17, 2020
1 parent 3fedcf8 commit 44d1689
Show file tree
Hide file tree
Showing 17 changed files with 50 additions and 32 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/update_package_version.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,11 @@ const updateVersion = file => {
};

Fs.readdirSync(".", { encoding: "utf8" })
.filter(file => file.includes(".json") && file.includes("morph"))
.filter(
file =>
file.includes(".json") &&
!file.includes("package") &&
!file.includes("esy") &&
!file.includes("benchmark")
)
.map(updateVersion);
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ _esy
node_modules

_coverage
_build
junit.xml
coverage.json

Expand Down
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
0.1.6
--------------
- Initial release
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.5
0.1.6
3 changes: 3 additions & 0 deletions cookie.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
description: "Parsing and printing cookies in OCaml and Reason"
maintainer: ["[email protected]"]
authors: ["Ulrik Strid"]
license: "BSD3-clause"
Expand All @@ -9,6 +10,8 @@ bug-reports: "https://github.com/ulrikstrid/ocaml-cookie/issues"
depends: [
"dune" {>= "1.11"}
"ocaml" {>= "4.06.0"}
"uri"
"ptime"
"astring"
]
build: [
Expand Down
6 changes: 6 additions & 0 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@

(package
(name cookie)
(description "Parsing and printing cookies in OCaml and Reason")
(depends
(ocaml (>= 4.06.0))
uri
ptime
astring
)
)

(package
(name session-cookie)
(description "Session implementation using the cookie library")
(depends
(ocaml (>= 4.06.0))
cookie
Expand All @@ -30,6 +34,7 @@

(package
(name session-cookie-async)
(description "Session implementation using the cookie library with async support")
(depends
(ocaml (>= 4.06.0))
session-cookie
Expand All @@ -39,6 +44,7 @@

(package
(name session-cookie-lwt)
(description "Session implementation using the cookie library with lwt support")
(depends
(ocaml (>= 4.06.0))
session-cookie
Expand Down
12 changes: 6 additions & 6 deletions esy.lock/index.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions lib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.1.4",
"version": "0.1.6",
"name": "@reason-native-web/cookie",
"license": "BSD-3-clause",
"homepage": "https://github.com/reason-native-web/ocaml-cookie",
Expand Down Expand Up @@ -36,4 +36,4 @@
"@opam/junit": "*",
"@opam/junit_alcotest": "*"
}
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.1.4",
"version": "0.1.5",
"name": "@reason-native-web/cookie_dev",
"license": "BSD-3-clause",
"homepage": "https://github.com/reason-native-web/ocaml-cookie",
Expand Down Expand Up @@ -33,7 +33,7 @@
"devDependencies": {
"ocaml": "~4.9.0",
"@opam/alcotest": "*",
"@opam/bisect_ppx": "aantron/bisect_ppx:bisect_ppx.opam#02c841c257126cb7d672ae84da646a1e165d87ca",
"@opam/bisect_ppx": "aantron/bisect_ppx:bisect_ppx.opam#d3adfddddf22fc5698060b08d4ea24595b671169",
"@opam/merlin": "*",
"@opam/ocamlformat": "*",
"@opam/odoc": "*",
Expand Down
15 changes: 8 additions & 7 deletions scripts/dune-release.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/bin/sh

TAG="$1"
NAME="$1"
TAG="$2"

if [ -z "$TAG" ]; then
printf "Usage: ./dune-release.sh <tag-name>\n"
if [ -z "$NAME" || -z "$TAG" ]; then
printf "Usage: ./dune-release.sh <library-name> <tag-name>\n"
printf "Please make sure that dune-release is available.\n"
exit 1
fi
Expand All @@ -18,10 +19,10 @@ step()

dune-release tag "$TAG"
step
dune-release distrib -p cookie -n cookie -t "$TAG" --skip-tests #--skip-lint
dune-release distrib -p "$NAME" -n "$NAME" -t "$TAG" --skip-tests #--skip-lint
step
dune-release publish distrib -p cookie -n cookie -t "$TAG"
dune-release publish distrib -p "$NAME" -n "$NAME" -t "$TAG"
step
dune-release opam pkg -p cookie -n cookie -t "$TAG"
dune-release opam pkg -p "$NAME" -n "$NAME" -t "$TAG"
step
dune-release opam submit -p cookie -n cookie -t "$TAG"
dune-release opam submit -p "$NAME" -n "$NAME" -t "$TAG"
7 changes: 0 additions & 7 deletions scripts/test-coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,11 @@ gsed -i '$i \(preprocess (pps bisect_ppx))\' lib/dune
echo running tests
BISECT_ENABLE=yes REPORT_PATH=./junit.xml esy test

esy echo "#{self.target_dir / 'default' / 'lib_test'}"

cp $(esy echo "#{self.target_dir / 'default' / 'lib_test' / 'junit.xml'}") ./junit.xml

echo copying bisect files
cp $(esy echo "#{self.target_dir / 'default' / 'lib_test'}")/[bisect]* ./

echo generating reports
esy bisect-ppx-report html
esy bisect-ppx-report summary

echo reseting files
git checkout lib/dune
rm *.coverage
rm test*.{exe,ml}
4 changes: 2 additions & 2 deletions session-cookie-async.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.1.4",
"version": "0.1.6",
"name": "@reason-native-web/session-cookie-async",
"license": "BSD-3-clause",
"homepage": "https://github.com/reason-native-web/ocaml-cookie",
Expand All @@ -19,4 +19,4 @@
"ocaml": "~4.9.0",
"@opam/merlin": "*"
}
}
}
2 changes: 2 additions & 0 deletions session-cookie-async.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
description:
"Session implementation using the cookie library with async support"
maintainer: ["[email protected]"]
authors: ["Ulrik Strid"]
license: "BSD3-clause"
Expand Down
4 changes: 2 additions & 2 deletions session-cookie-lwt.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.1.4",
"version": "0.1.6",
"name": "@reason-native-web/session-cookie-lwt",
"license": "BSD-3-clause",
"homepage": "https://github.com/reason-native-web/ocaml-cookie",
Expand All @@ -19,4 +19,4 @@
"ocaml": "~4.9.0",
"@opam/merlin": "*"
}
}
}
2 changes: 2 additions & 0 deletions session-cookie-lwt.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
description:
"Session implementation using the cookie library with lwt support"
maintainer: ["[email protected]"]
authors: ["Ulrik Strid"]
license: "BSD3-clause"
Expand Down
4 changes: 2 additions & 2 deletions session-cookie.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.1.4",
"version": "0.1.6",
"name": "@reason-native-web/session-cookie",
"license": "BSD-3-clause",
"homepage": "https://github.com/reason-native-web/ocaml-cookie",
Expand Down Expand Up @@ -34,4 +34,4 @@
"@opam/junit": "*",
"@opam/junit_alcotest": "*"
}
}
}
1 change: 1 addition & 0 deletions session-cookie.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
description: "Session implementation using the cookie library"
maintainer: ["[email protected]"]
authors: ["Ulrik Strid"]
license: "BSD3-clause"
Expand Down

0 comments on commit 44d1689

Please sign in to comment.