From e20463df1960be69c6b6765ddeacce5dd0960634 Mon Sep 17 00:00:00 2001 From: sorki Date: Wed, 13 Dec 2023 09:26:08 +0100 Subject: [PATCH 1/2] remote: add Arbitrary Eq for SuccessCodeReply --- hnix-store-remote/src/System/Nix/Store/Remote/Arbitrary.hs | 3 +++ .../src/System/Nix/Store/Remote/Types/SuccessCodeReply.hs | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hnix-store-remote/src/System/Nix/Store/Remote/Arbitrary.hs b/hnix-store-remote/src/System/Nix/Store/Remote/Arbitrary.hs index 3a08a87..0ab81b9 100644 --- a/hnix-store-remote/src/System/Nix/Store/Remote/Arbitrary.hs +++ b/hnix-store-remote/src/System/Nix/Store/Remote/Arbitrary.hs @@ -123,6 +123,9 @@ instance Arbitrary (Some StoreRequest) where -- ** Reply +deriving via GenericArbitrary SuccessCodeReply + instance Arbitrary SuccessCodeReply + deriving via GenericArbitrary GCResult instance Arbitrary GCResult diff --git a/hnix-store-remote/src/System/Nix/Store/Remote/Types/SuccessCodeReply.hs b/hnix-store-remote/src/System/Nix/Store/Remote/Types/SuccessCodeReply.hs index 1b9eeda..1b38d05 100644 --- a/hnix-store-remote/src/System/Nix/Store/Remote/Types/SuccessCodeReply.hs +++ b/hnix-store-remote/src/System/Nix/Store/Remote/Types/SuccessCodeReply.hs @@ -2,7 +2,9 @@ module System.Nix.Store.Remote.Types.SuccessCodeReply ( SuccessCodeReply(..) ) where +import GHC.Generics (Generic) + -- | Reply that checks an int success return value data SuccessCodeReply = SuccessCodeReply - deriving (Show) + deriving (Eq, Show, Generic) From 083dfd804401dd62748bb03375d5c5930c6c0a91 Mon Sep 17 00:00:00 2001 From: sorki Date: Wed, 13 Dec 2023 09:26:30 +0100 Subject: [PATCH 2/2] CI: re-enable on.pull_request --- .github/workflows/ci.dhall.frozen | 2 +- .github/workflows/ci.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.dhall.frozen b/.github/workflows/ci.dhall.frozen index f03ce19..5482713 100644 --- a/.github/workflows/ci.dhall.frozen +++ b/.github/workflows/ci.dhall.frozen @@ -1,6 +1,6 @@ let haskellCi = https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall - sha256:a39801f73d93c6e0f91942755ef8ae4c50947e9a9b180b6724957229470f7b8d + sha256:5d7058a7684fd5315467b562853bd1c4a43da691c09293d3715ee739dfa26e08 let defSteps = haskellCi.defaultCabalSteps diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6dcffea..887cc04 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -57,6 +57,7 @@ jobs: - "macos-latest" name: Haskell CI 'on': + pull_request: {} push: {} schedule: - cron: "4 20 10 * *"