From 6b4d9562c94e4de1eb95bbed0d688751539eeb2c Mon Sep 17 00:00:00 2001 From: Tomas Janousek Date: Sun, 5 Oct 2025 16:26:57 +0100 Subject: [PATCH 1/3] ci: Update haskell-ci-hackage.patch haskell-ci added "merge_group" recently. --- .github/workflows/haskell-ci-hackage.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/haskell-ci-hackage.patch b/.github/workflows/haskell-ci-hackage.patch index 31aec73..8362b90 100644 --- a/.github/workflows/haskell-ci-hackage.patch +++ b/.github/workflows/haskell-ci-hackage.patch @@ -19,14 +19,16 @@ set in GitHub repository secrets. --- .github/workflows/haskell-ci.yml.orig +++ .github/workflows/haskell-ci.yml -@@ -14,8 +14,15 @@ +@@ -14,9 +14,16 @@ # name: Haskell-CI on: - - push - - pull_request +- - merge_group + push: + pull_request: ++ merge_group: + release: + types: + - published From 74013034c3967d66bfaf5e7b0ffa966a089c3c58 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 5 Oct 2025 15:40:34 +0000 Subject: [PATCH 2/3] ci: Bump GHC patch versions in tested-with --- X11.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/X11.cabal b/X11.cabal index 184f3d7..d3c78df 100644 --- a/X11.cabal +++ b/X11.cabal @@ -10,7 +10,7 @@ license-file: LICENSE copyright: Alastair Reid, 1999-2003, libraries@haskell.org 2003-2007, Don Stewart 2007-2009, Spencer Janssen 2007-2009, Daniel Wagner 2009-2011. maintainer: Daniel Wagner -tested-with: GHC == 8.0.2 || == 8.2.2 || == 8.4.4 || == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.7 || == 9.8.4 || == 9.10.2 || == 9.12.2 +tested-with: GHC == 8.0.2 || == 8.2.2 || == 8.4.4 || == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.7 || == 9.8.4 || == 9.10.3 || == 9.12.2 category: Graphics homepage: https://github.com/xmonad/X11 bug-reports: https://github.com/xmonad/X11/issues From d5801b751a2bc5cb96bec536806445b8ffe20b12 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 5 Oct 2025 15:40:34 +0000 Subject: [PATCH 3/3] ci: Regenerate haskell-ci --- .github/workflows/haskell-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index badc14e..c0d432a 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,14 +8,15 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20250801 +# version: 0.19.20250917 # -# REGENDATA ("0.19.20250801",["github","cabal.project"]) +# REGENDATA ("0.19.20250917",["github","cabal.project"]) # name: Haskell-CI on: push: pull_request: + merge_group: release: types: - published @@ -40,9 +41,9 @@ jobs: compilerVersion: 9.12.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.10.2 + - compiler: ghc-9.10.3 compilerKind: ghc - compilerVersion: 9.10.2 + compilerVersion: 9.10.3 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.4