From 70de308253cd06c8083ca337275068612428b549 Mon Sep 17 00:00:00 2001 From: Andrew Martin Date: Mon, 1 Aug 2016 16:20:52 -0400 Subject: [PATCH] version bump for colonnade --- colonnade/colonnade.cabal | 2 +- geolite-csv/hackage-docs.sh | 48 +++++++++++++++++++++++++++++++++++++ siphon/hackage-docs.sh | 48 +++++++++++++++++++++++++++++++++++++ siphon/siphon.cabal | 4 ++-- 4 files changed, 99 insertions(+), 3 deletions(-) create mode 100755 geolite-csv/hackage-docs.sh create mode 100755 siphon/hackage-docs.sh diff --git a/colonnade/colonnade.cabal b/colonnade/colonnade.cabal index 4dac555..b55e754 100644 --- a/colonnade/colonnade.cabal +++ b/colonnade/colonnade.cabal @@ -1,5 +1,5 @@ name: colonnade -version: 0.3 +version: 0.4 synopsis: Generic types and functions for columnar encoding and decoding description: Please see README.md homepage: https://github.com/andrewthad/colonnade#readme diff --git a/geolite-csv/hackage-docs.sh b/geolite-csv/hackage-docs.sh new file mode 100755 index 0000000..0ddbc20 --- /dev/null +++ b/geolite-csv/hackage-docs.sh @@ -0,0 +1,48 @@ +#!/bin/bash +set -e + +if [ "$#" -ne 1 ]; then + echo "Usage: scripts/hackage-docs.sh HACKAGE_USER" + exit 1 +fi + +user=$1 + +cabal_file=$(find . -maxdepth 1 -name "*.cabal" -print -quit) +if [ ! -f "$cabal_file" ]; then + echo "Run this script in the top-level package directory" + exit 1 +fi + +pkg=$(awk -F ":[[:space:]]*" 'tolower($1)=="name" { print $2 }' < "$cabal_file") +ver=$(awk -F ":[[:space:]]*" 'tolower($1)=="version" { print $2 }' < "$cabal_file") + +if [ -z "$pkg" ]; then + echo "Unable to determine package name" + exit 1 +fi + +if [ -z "$ver" ]; then + echo "Unable to determine package version" + exit 1 +fi + +echo "Detected package: $pkg-$ver" + +dir=$(mktemp -d build-docs.XXXXXX) +trap 'rm -r "$dir"' EXIT + +# cabal haddock --hoogle --hyperlink-source --html-location='/package/$pkg-$version/docs' --contents-location='/package/$pkg-$version' +stack haddock + +cp -R .stack-work/dist/x86_64-linux/Cabal-1.22.5.0/doc/html/$pkg/ $dir/$pkg-$ver-docs +# /home/andrew/.stack/snapshots/x86_64-linux/lts-5.17/7.10.3/doc/index.html + +tar cvz -C $dir --format=ustar -f $dir/$pkg-$ver-docs.tar.gz $pkg-$ver-docs + +curl -X PUT \ + -H 'Content-Type: application/x-tar' \ + -H 'Content-Encoding: gzip' \ + -u "$user" \ + --data-binary "@$dir/$pkg-$ver-docs.tar.gz" \ + "https://hackage.haskell.org/package/$pkg-$ver/docs" diff --git a/siphon/hackage-docs.sh b/siphon/hackage-docs.sh new file mode 100755 index 0000000..0ddbc20 --- /dev/null +++ b/siphon/hackage-docs.sh @@ -0,0 +1,48 @@ +#!/bin/bash +set -e + +if [ "$#" -ne 1 ]; then + echo "Usage: scripts/hackage-docs.sh HACKAGE_USER" + exit 1 +fi + +user=$1 + +cabal_file=$(find . -maxdepth 1 -name "*.cabal" -print -quit) +if [ ! -f "$cabal_file" ]; then + echo "Run this script in the top-level package directory" + exit 1 +fi + +pkg=$(awk -F ":[[:space:]]*" 'tolower($1)=="name" { print $2 }' < "$cabal_file") +ver=$(awk -F ":[[:space:]]*" 'tolower($1)=="version" { print $2 }' < "$cabal_file") + +if [ -z "$pkg" ]; then + echo "Unable to determine package name" + exit 1 +fi + +if [ -z "$ver" ]; then + echo "Unable to determine package version" + exit 1 +fi + +echo "Detected package: $pkg-$ver" + +dir=$(mktemp -d build-docs.XXXXXX) +trap 'rm -r "$dir"' EXIT + +# cabal haddock --hoogle --hyperlink-source --html-location='/package/$pkg-$version/docs' --contents-location='/package/$pkg-$version' +stack haddock + +cp -R .stack-work/dist/x86_64-linux/Cabal-1.22.5.0/doc/html/$pkg/ $dir/$pkg-$ver-docs +# /home/andrew/.stack/snapshots/x86_64-linux/lts-5.17/7.10.3/doc/index.html + +tar cvz -C $dir --format=ustar -f $dir/$pkg-$ver-docs.tar.gz $pkg-$ver-docs + +curl -X PUT \ + -H 'Content-Type: application/x-tar' \ + -H 'Content-Encoding: gzip' \ + -u "$user" \ + --data-binary "@$dir/$pkg-$ver-docs.tar.gz" \ + "https://hackage.haskell.org/package/$pkg-$ver/docs" diff --git a/siphon/siphon.cabal b/siphon/siphon.cabal index 23e9442..184e2cc 100644 --- a/siphon/siphon.cabal +++ b/siphon/siphon.cabal @@ -1,5 +1,5 @@ name: siphon -version: 0.1 +version: 0.2 synopsis: Generic types and functions for columnar encoding and decoding description: Please see README.md homepage: https://github.com/andrewthad/colonnade#readme @@ -26,7 +26,7 @@ library Siphon.Internal.Text build-depends: base >= 4.7 && < 5 - , colonnade + , colonnade >= 0.4 && < 0.5 , text , bytestring , contravariant