Skip to content

Commit c5ae5f6

Browse files
committed
Try merge queues
1 parent 6816ae5 commit c5ae5f6

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

.github/workflows/ci.dhall

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
let haskellCi =
2-
https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall
2+
https://raw.githubusercontent.com/obsidiansystems/github-actions-dhall/merge-group/haskell-ci.dhall
33

44
let defSteps = haskellCi.defaultCabalSteps
55

6-
in haskellCi.generalCi
6+
let ci =
7+
haskellCi.generalCi
78
( haskellCi.withNix
89
( defSteps
910
with docStep = None haskellCi.BuildStep
@@ -24,4 +25,6 @@ in haskellCi.generalCi
2425
, ghc = [ haskellCi.GHC.GHC9102, haskellCi.GHC.GHC984 ]
2526
, os = [ haskellCi.OS.Ubuntu, haskellCi.OS.MacOS ]
2627
}
27-
: haskellCi.CI.Type
28+
29+
in ci
30+
with on = ci.on // { merge_group = Some haskellCi.MergeGroup.default }

.github/workflows/ci.dhall.frozen

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
let haskellCi =
2-
https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall
3-
sha256:1f1a5102e99ea92eb585b4d36aaeabb0bd93d39e62ba82f3080250fdc234e33a
2+
https://raw.githubusercontent.com/obsidiansystems/github-actions-dhall/merge-group/haskell-ci.dhall
3+
sha256:66e034024b7fa1606428cba5c009999d44dd95613b41acee2700f8e31c7902f1
44

55
let defSteps = haskellCi.defaultCabalSteps
66

7-
in haskellCi.generalCi
7+
let ci =
8+
haskellCi.generalCi
89
( haskellCi.withNix
910
( defSteps
1011
with docStep = None haskellCi.BuildStep
@@ -25,4 +26,6 @@ in haskellCi.generalCi
2526
, ghc = [ haskellCi.GHC.GHC9102, haskellCi.GHC.GHC984 ]
2627
, os = [ haskellCi.OS.Ubuntu, haskellCi.OS.MacOS ]
2728
}
28-
: haskellCi.CI.Type
29+
30+
in ci
31+
with on = ci.on // { merge_group = Some haskellCi.MergeGroup.default }

.github/workflows/ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,6 @@ jobs:
5757
- "macos-latest"
5858
name: Haskell CI
5959
'on':
60+
merge_group: {}
6061
pull_request: {}
6162
push: {}

0 commit comments

Comments
 (0)