[commit: packages/time] ghc,master: Update version to 1.8.0.1; update Checklist (4a4e2ce)
git at git.haskell.org
git at git.haskell.org
Fri Apr 21 16:57:41 UTC 2017
Repository : ssh://git@git.haskell.org/time
On branches: ghc,master
Link : http://git.haskell.org/packages/time.git/commitdiff/4a4e2ce6a1bf099393772737d848d900832ee84d
>---------------------------------------------------------------
commit 4a4e2ce6a1bf099393772737d848d900832ee84d
Author: Ashley Yakeley <ashley at yakeley.org>
Date: Fri Mar 10 11:53:01 2017 -0800
Update version to 1.8.0.1; update Checklist
>---------------------------------------------------------------
4a4e2ce6a1bf099393772737d848d900832ee84d
Checklist | 18 ++++++++++++------
benchmark/time-bench.cabal | 2 +-
changelog.md | 3 +++
configure.ac | 2 +-
stack.yaml | 2 +-
time.cabal | 2 +-
6 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/Checklist b/Checklist
index 1bc2c44..9f3d6a1 100644
--- a/Checklist
+++ b/Checklist
@@ -18,8 +18,8 @@ Before release:
4. Use latest LTS resolver
https://www.stackage.org/lts
- time.cabal
- (not necessarily benchmark/time-bench.cabal)
+ stack.yaml
+ (not necessarily benchmark/stack.yaml)
5. Build & test
@@ -45,22 +45,28 @@ Before release:
https://travis-ci.org/haskell/time
-10. Build and test on Windows
+10. Build and test on 32-bit Linux machine
+
+ git pull
+ stack build --pedantic --test --haddock && echo OK
+ (ignore errors)
+
+11. Build and test on Windows
git pull
stack build --pedantic --test --haddock && echo OK
-11. Upload to Hackage
+12. Upload to Hackage
stack upload .
http://hackage.haskell.org/package/time
-12. Tag commit
+13. Tag commit
git tag -a -s [TAG]
git push --tags
-13. Update ghc branch
+14. Update ghc branch
git checkout ghc
git merge master
diff --git a/benchmark/time-bench.cabal b/benchmark/time-bench.cabal
index 4cc6559..2e0598f 100644
--- a/benchmark/time-bench.cabal
+++ b/benchmark/time-bench.cabal
@@ -4,7 +4,7 @@ author: Winter
homepage: https://github.com/haskell/time
bug-reports: https://github.com/haskell/time/issues
cabal-version: >=1.10
-build-type: Simple
+build-type: Simple
executable time-bench
diff --git a/changelog.md b/changelog.md
index 87b9659..9852afe 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,8 @@
# Change Log
+## [1.8.0.1]
+- Get building on 32 bit machine
+
## [1.8]
- Added SystemTime
- Data.Time.Format: allow padding widths in specifiers for formatting (but not parsing)
diff --git a/configure.ac b/configure.ac
index 02104dc..8baf740 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Haskell time package], [1.8], [ashley at semantic.org], [time])
+AC_INIT([Haskell time package], [1.8.0.1], [ashley at semantic.org], [time])
# Safety check: Ensure that we are in the correct source directory.
AC_CONFIG_SRCDIR([lib/include/HsTime.h])
diff --git a/stack.yaml b/stack.yaml
index 01d8752..819c851 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-8.0
+resolver: lts-8.4
packages:
- '.'
allow-newer: true
diff --git a/time.cabal b/time.cabal
index 6fb2731..a3a9bf7 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
name: time
-version: 1.8
+version: 1.8.0.1
stability: stable
license: BSD3
license-file: LICENSE
More information about the ghc-commits
mailing list