From 3b15d5c9f545f125d71e90f302e20a771fda20c0 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Wed, 13 Oct 2021 11:18:39 +0000
Subject: [PATCH 1/3] test ci

Change-Id: Ib221e05457e247519c1b45fdcd87e32063362c7e
---
 .github/workflows/main.yml                 | 4 ++--
 matrix-client/src/Network/Matrix/Client.hs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a59cf12..0ae9c84 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,9 +1,9 @@
 name: CI
 on:
   push:
-    branches: [ main ]
+    branches: [ master ]
   pull_request:
-    branches: [ main ]
+    branches: [ master ]
 jobs:
   cabal:
     runs-on: ubuntu-latest
diff --git a/matrix-client/src/Network/Matrix/Client.hs b/matrix-client/src/Network/Matrix/Client.hs
index 5e74813..11bbe51 100644
--- a/matrix-client/src/Network/Matrix/Client.hs
+++ b/matrix-client/src/Network/Matrix/Client.hs
@@ -654,4 +654,4 @@ instance ToJSON SyncResultRoom where
   toJSON = genericToJSON aesonOptions
 
 instance FromJSON SyncResultRoom where
-  parseJSON = genericParseJSON aesonOptions
+  parseJSON = genericParseJSON aesonOptions 42

From affe4e517850d64c3f6adc71043ceffc1b6a5ac5 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Wed, 13 Oct 2021 11:24:15 +0000
Subject: [PATCH 2/3] fix action

Change-Id: Icd355007adff9f5a6a07b7214e404ab318c5cfcd
---
 .github/workflows/main.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0ae9c84..e0af5fa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,9 +28,10 @@ jobs:
           ${{ runner.os }}-${{ matrix.ghc }}-
           ${{ runner.os }}-
     - run: cabal update
-    - run: cabal build --enable-tests --flags=ci
-    - run: cabal test --enable-tests --flags=ci --test-show-details=direct
-    - run: cabal haddock
-    - run: cabal sdist
-    - run: cabal check
-    - run: cabal install --installdir=/tmp --overwrite-policy=always
+    - run: cabal build --enable-tests --flags=ci all
+    - run: cabal test --enable-tests --flags=ci --test-show-details=direct all
+    - run: cabal haddock all
+    - run: cabal sdist all
+    - run: cd matrix-client; cabal check
+#    - run: cd matrix-bot; cabal check
+    - run: cabal install --installdir=/tmp --overwrite-policy=always --lib all

From 7a94f73587a4405bfd226ee9f85aaaf788ca28e1 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Wed, 13 Oct 2021 11:34:14 +0000
Subject: [PATCH 3/3] fix code

Change-Id: I5229260ea056a3a2e37f352e462170c36fdcb495
---
 matrix-client/src/Network/Matrix/Client.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-client/src/Network/Matrix/Client.hs b/matrix-client/src/Network/Matrix/Client.hs
index 11bbe51..5e74813 100644
--- a/matrix-client/src/Network/Matrix/Client.hs
+++ b/matrix-client/src/Network/Matrix/Client.hs
@@ -654,4 +654,4 @@ instance ToJSON SyncResultRoom where
   toJSON = genericToJSON aesonOptions
 
 instance FromJSON SyncResultRoom where
-  parseJSON = genericParseJSON aesonOptions 42
+  parseJSON = genericParseJSON aesonOptions