ci: Reenable testing against released X11, xmonad

This was temporarily disabled in 229d52ff07 and 086db3123b because we
couldn't keep xmonad-contrib backwards compatible with xmonad 0.15 any
more, but xmonad 0.17.0 is out now and we can try to stay compatible for
a while.

.github/workflows/stack.yml

@@ -12,10 +12,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # XXX: temporarily disabled until xmonad 0.17 release
-          # - resolver: lts-12
-          #   ghc: 8.4.4
-          #   yaml: stack.yaml
+          - resolver: lts-12
+            ghc: 8.4.4
+            yaml: stack.yaml
           - resolver: lts-12
             ghc: 8.4.4
             yaml: stack-master.yaml
@@ -25,12 +24,12 @@ jobs:
           - resolver: lts-16
             ghc: 8.8.4
             yaml: stack-master.yaml
-          # - resolver: lts-17
-          #   ghc: 8.10.4
-          #   yaml: stack.yaml
           - resolver: lts-17
             ghc: 8.10.4
             yaml: stack-master.yaml
+          - resolver: lts-18
+            ghc: 8.10.7
+            yaml: stack.yaml
           - resolver: lts-18
             ghc: 8.10.7
             yaml: stack-master.yaml

stack-master.yaml

@@ -1,5 +1,5 @@
-# This stack.yaml is used to build xmonad-contrib with master version
-# of xmonad
+# This stack.yaml is used to build xmonad-contrib with master versions
+# of X11 and xmonad
 
 resolver: lts-17.14
 

stack.yaml

@@ -1 +0,0 @@
-stack-master.yaml

stack.yaml

@@ -0,0 +1,24 @@
+# This stack.yaml is used to build xmonad-contrib with released versions
+# of X11 and xmonad
+
+resolver: lts-17.14
+
+packages:
+- ./
+
+extra-deps:
+- X11-1.10.2
+- xmonad-0.17.0
+
+nix:
+  packages:
+    - pkg-config
+    - xorg.libX11
+    - xorg.libXext
+    - xorg.libXft
+    - xorg.libXrandr
+    - xorg.libXrender
+    - xorg.libXScrnSaver
+
+ghc-options:
+  xmonad-contrib: '-j'