diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## Unreleased changes +## 1.1.0 + +* Fix: type int to int64 +* Misc: add ignore file: `stack.yaml.lock` +* Misc: update dependencies with LTS 15 + * use extensible-0.8 + ## 1.0.1 - Refactor dependent packages diff --git a/drone.cabal b/drone.cabal --- a/drone.cabal +++ b/drone.cabal @@ -1,13 +1,13 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.31.0. +-- This file has been generated from package.yaml by hpack version 0.31.2. -- -- see: https://github.com/sol/hpack -- --- hash: 6aac0feafa2f45286d481be0c7bdbac46e5c5ae1622b6ccc447d8ddea862602c +-- hash: 586025dbc8658a0f909cb5618f74f2015236f76e3117a1fb20cfe2a016248e3d name: drone -version: 1.0.1 +version: 1.1.0 description: Please see the README on GitHub at homepage: https://github.com/matsubara0507/drone-haskell#readme bug-reports: https://github.com/matsubara0507/drone-haskell/issues @@ -60,7 +60,7 @@ base >=4.7 && <5 , bytestring , containers >=0.5.4 - , extensible >=0.4.8 + , extensible >=0.6 , formatting >=6.3.0 , microlens , req >=1.0.0 @@ -89,7 +89,7 @@ , bytestring , containers >=0.5.4 , drone - , extensible >=0.4.8 + , extensible >=0.6 , formatting >=6.3.0 , hspec , microlens diff --git a/src/Drone/Types/Build.hs b/src/Drone/Types/Build.hs --- a/src/Drone/Types/Build.hs +++ b/src/Drone/Types/Build.hs @@ -5,21 +5,22 @@ module Drone.Types.Build where import Data.Extensible +import Data.Int (Int64) import Data.Map (Map) import Data.Text (Text) type Build = Record - '[ "id" >: Int - , "repo_id" >: Int + '[ "id" >: Int64 + , "repo_id" >: Int64 , "trigger" >: Text - , "number" >: Int - , "parent" >: Maybe Int + , "number" >: Int64 + , "parent" >: Maybe Int64 , "status" >: Text , "error" >: Maybe Text , "event" >: Text , "action" >: Text , "link" >: Text - , "timestamp" >: Int + , "timestamp" >: Int64 , "title" >: Maybe Text , "message" >: Text , "before" >: Text @@ -35,17 +36,17 @@ , "sender" >: Text , "params" >: Maybe (Map Text Text) , "deploy_to" >: Maybe Text - , "started" >: Int - , "finished" >: Int - , "created" >: Int - , "updated" >: Int - , "version" >: Int + , "started" >: Int64 + , "finished" >: Int64 + , "created" >: Int64 + , "updated" >: Int64 + , "version" >: Int64 , "stages" >: Maybe [Stage] ] type Stage = Record - '[ "id" >: Int - , "build_id" >: Int + '[ "id" >: Int64 + , "build_id" >: Int64 , "number" >: Int , "name" >: Text , "kind" >: Maybe Text @@ -59,11 +60,11 @@ , "arch" >: Text , "variant" >: Maybe Text , "kernel" >: Maybe Text - , "started" >: Int - , "stopped" >: Int - , "created" >: Int - , "updated" >: Int - , "version" >: Int + , "started" >: Int64 + , "stopped" >: Int64 + , "created" >: Int64 + , "updated" >: Int64 + , "version" >: Int64 , "on_success" >: Bool , "on_failure" >: Bool , "depends_on" >: Maybe [Text] @@ -72,15 +73,15 @@ ] type Step = Record - '[ "id" >: Int - , "step_id" >: Int + '[ "id" >: Int64 + , "step_id" >: Int64 , "number" >: Int , "name" >: Text , "status" >: Text , "error" >: Maybe Text , "errignore" >: Maybe Bool , "exit_code" >: Int - , "started" >: Maybe Int - , "stopped" >: Maybe Int - , "version" >: Int + , "started" >: Maybe Int64 + , "stopped" >: Maybe Int64 + , "version" >: Int64 ] diff --git a/src/Drone/Types/Cron.hs b/src/Drone/Types/Cron.hs --- a/src/Drone/Types/Cron.hs +++ b/src/Drone/Types/Cron.hs @@ -4,24 +4,26 @@ module Drone.Types.Cron where import Data.Extensible -import Data.Text (Text) +import Data.Functor.Identity (Identity) +import Data.Int (Int64) +import Data.Text (Text) type Cron = Record - '[ "id" >: Int - , "repo_id" >: Int + '[ "id" >: Int64 + , "repo_id" >: Int64 , "name" >: Text , "expr" >: Text - , "next" >: Int - , "prev" >: Int + , "next" >: Int64 + , "prev" >: Int64 , "event" >: Text , "branch" >: Text -- , "target" >: Text , "disabled" >: Bool - , "created" >: Int - , "updated" >: Int + , "created" >: Int64 + , "updated" >: Int64 ] -type CronPatch = Nullable (Field Identity) :* CronPatchFields +type CronPatch = CronPatchFields :& Nullable (Field Identity) type CronPatchFields = '[ "event" >: Text diff --git a/src/Drone/Types/Log.hs b/src/Drone/Types/Log.hs --- a/src/Drone/Types/Log.hs +++ b/src/Drone/Types/Log.hs @@ -4,10 +4,11 @@ module Drone.Types.Log where import Data.Extensible +import Data.Int (Int64) import Data.Text (Text) type Line = Record '[ "pos" >: Int , "out" >: Text - , "time" >: Int + , "time" >: Int64 ] diff --git a/src/Drone/Types/Node.hs b/src/Drone/Types/Node.hs --- a/src/Drone/Types/Node.hs +++ b/src/Drone/Types/Node.hs @@ -4,11 +4,13 @@ module Drone.Types.Node where import Data.Extensible -import Data.Map (Map) -import Data.Text (Text) +import Data.Functor.Identity (Identity) +import Data.Int (Int64) +import Data.Map (Map) +import Data.Text (Text) type Node = Record - '[ "id" >: Int + '[ "id" >: Int64 , "uid" >: Text , "provider" >: Text , "state" >: Text @@ -31,11 +33,11 @@ , "tls_cert" >: Text , "paused" >: Bool , "protected" >: Bool - , "created" >: Int - , "updated" >: Int + , "created" >: Int64 + , "updated" >: Int64 ] -type NodePatch = Nullable (Field Identity) :* NodePatchFields +type NodePatch = NodePatchFields :& Nullable (Field Identity) type NodePatchFields = '[ "uid" >: Text diff --git a/src/Drone/Types/Repo.hs b/src/Drone/Types/Repo.hs --- a/src/Drone/Types/Repo.hs +++ b/src/Drone/Types/Repo.hs @@ -10,12 +10,14 @@ )where import Data.Extensible -import Data.Text (Text) +import Data.Functor.Identity (Identity) +import Data.Int (Int64) +import Data.Text (Text) type Repo = Record - '[ "id" >: Int + '[ "id" >: Int64 , "uid" >: Text - , "user_id" >: Int + , "user_id" >: Int64 , "namespace" >: Text , "name" >: Text , "slug" >: Text @@ -30,21 +32,21 @@ , "config_path" >: Text , "trusted" >: Bool , "protected" >: Bool - , "timeout" >: Int + , "timeout" >: Int64 , "counter" >: Int - , "synced" >: Int - , "created" >: Int - , "updated" >: Int - , "version" >: Int + , "synced" >: Int64 + , "created" >: Int64 + , "updated" >: Int64 + , "version" >: Int64 ] -type RepoPatch = Nullable (Field Identity) :* RepoPatchFields +type RepoPatch = RepoPatchFields :& Nullable (Field Identity) type RepoPatchFields = '[ "config_path" >: Text , "protected" >: Bool , "trusted" >: Bool - , "timeout" >: Int + , "timeout" >: Int64 , "visibility" >: Text , "counter" >: Int ] diff --git a/src/Drone/Types/Server.hs b/src/Drone/Types/Server.hs --- a/src/Drone/Types/Server.hs +++ b/src/Drone/Types/Server.hs @@ -4,6 +4,7 @@ module Drone.Types.Server where import Data.Extensible +import Data.Int (Int64) import Data.Text (Text) type Server = Record @@ -22,10 +23,10 @@ , "ca_cert" >: Text , "tls_key" >: Text , "tls_cert" >: Text - , "created" >: Int - , "updated" >: Int - , "started" >: Int - , "stopped" >: Int + , "created" >: Int64 + , "updated" >: Int64 + , "started" >: Int64 + , "stopped" >: Int64 ] type Version = Record diff --git a/src/Drone/Types/User.hs b/src/Drone/Types/User.hs --- a/src/Drone/Types/User.hs +++ b/src/Drone/Types/User.hs @@ -4,10 +4,11 @@ module Drone.Types.User where import Data.Extensible +import Data.Int (Int64) import Data.Text (Text) type User = Record - '[ "id" >: Int + '[ "id" >: Int64 , "login" >: Text , "email" >: Text , "avatar" >: Text @@ -15,8 +16,8 @@ , "admin" >: Bool , "machine" >: Bool , "syncing" >: Bool - , "synced" >: Int - , "created" >: Int - , "updated" >: Int - , "last_login" >: Int + , "synced" >: Int64 + , "created" >: Int64 + , "updated" >: Int64 + , "last_login" >: Int64 ]