Skip to content

Commit da34e00

Browse files
committed
Update the stack resolver and the CIs
1 parent aa2f1e7 commit da34e00

File tree

4 files changed

+67
-48
lines changed

4 files changed

+67
-48
lines changed

.github/workflows/packcheck.yml

Lines changed: 59 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ on:
2222

2323
jobs:
2424
build:
25-
name: >-
26-
${{ matrix.name }}
27-
${{ matrix.command }}
28-
${{ matrix.runner }}
29-
${{ matrix.ghc_version }}
25+
name: ${{ matrix.name }}
3026
env:
3127
# ------------------------------------------------------------------------
3228
# Common options
@@ -89,46 +85,65 @@ jobs:
8985
strategy:
9086
fail-fast: false
9187
matrix:
92-
# The reason we have name here is to force an additional config instead
93-
# of adding to an existing config while adding additional configs.
94-
# Look at <https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix>
95-
# for more info about adding matrix elements.
96-
# Adding any element to the list will increase the number of matrix
97-
# elemets proportional to the cross product.
98-
name: [ci]
99-
# Uncomment GHC versions you want the CI to run on.
100-
ghc_version:
101-
[ 9.0.1
102-
, 8.10.3
103-
, 8.8.4
104-
, 8.6.5
105-
, 8.4.4
106-
, 8.2.2
107-
, 8.0.2
108-
]
109-
command:
110-
[ cabal-v2
111-
# , stack
112-
]
113-
runner:
114-
[ ubuntu-latest
115-
# , macos-latest
116-
]
88+
name:
89+
- 9.0.1
90+
- 8.10.7
91+
- 8.10.7+stack
92+
- 8.8.4
93+
- 8.6.5
94+
- 8.4.4
95+
- 8.2.2
96+
- 8.0.2
11797
include:
118-
# Additional ci matrix elements
119-
- name: ci
120-
command: stack
98+
- name: 9.0.1
99+
ghc-version: 9.0.1
100+
command: cabal-v2
121101
runner: ubuntu-latest
102+
cabal-version: 3.2
122103

123-
# - name: ci
124-
# ghc_version: 8.4.4
125-
# command: stack
126-
# runner: ubuntu-latest
104+
- name: 8.10.7
105+
ghc-version: 8.10.7
106+
command: cabal-v2
107+
runner: ubuntu-latest
108+
cabal-version: 3.2
127109

128-
# - name: ci
129-
# ghc_version: 8.8.3
130-
# command: cabal-v2
131-
# runner: macos-latest
110+
- name: 8.8.4
111+
ghc-version: 8.8.4
112+
command: cabal-v2
113+
runner: ubuntu-latest
114+
cabal-version: 3.2
115+
116+
- name: 8.6.5
117+
ghc-version: 8.6.5
118+
command: cabal-v2
119+
runner: ubuntu-latest
120+
cabal-version: 3.2
121+
122+
- name: 8.4.4
123+
ghc-version: 8.4.4
124+
command: cabal-v2
125+
runner: ubuntu-latest
126+
cabal-version: 3.2
127+
128+
- name: 8.2.2
129+
ghc-version: 8.2.2
130+
command: cabal-v2
131+
runner: ubuntu-latest
132+
cabal-version: 3.2
133+
134+
- name: 8.0.2
135+
ghc-version: 8.0.2
136+
command: cabal-v2
137+
runner: ubuntu-latest
138+
cabal-version: 3.2
139+
140+
- name: 8.10.7+stack
141+
ghc-version: 8.10.7
142+
command: stack
143+
runner: ubuntu-latest
144+
cabal-version: 3.2
145+
pack_options: >-
146+
RESOLVER=lts-18.18
132147
133148
# - name: hlint
134149
# command: cabal-v2
@@ -141,11 +156,10 @@ jobs:
141156
- uses: actions/checkout@v2
142157

143158
- uses: haskell/actions/setup@v1
144-
if: ${{ matrix.name != 'hlint' }}
145159
with:
146-
ghc-version: ${{ matrix.ghc_version }}
147-
# We need not put this in the matrix. This will be fixed in most cases.
148-
cabal-version: 3.2
160+
ghc-version: ${{ matrix.ghc-version }}
161+
cabal-version: ${{ matrix.cabal-version }}
162+
149163

150164
- uses: actions/cache@v2
151165
name: Cache common directories

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ environment:
3434
# version.
3535
#STACKVER: "1.6.5"
3636
STACK_UPGRADE: "y"
37-
RESOLVER: "lts-15"
37+
RESOLVER: "lts-18.18"
3838
STACK_ROOT: "c:\\sr"
3939

4040
# ------------------------------------------------------------------------

stack.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
packages:
22
- '.'
3-
resolver: lts-18.3
3+
resolver: lts-18.18
44
extra-deps:
55
- unicode-data-0.2.0
66
- tasty-bench-0.3
7+
8+
# Look at https://stackoverflow.com/questions/70045586/could-not-find-module-system-console-mintty-win32-when-compiling-test-framework
9+
flags:
10+
mintty:
11+
Win32-2-13-1: false

unicode-transforms.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tested-with: GHC==8.0.2
1919
, GHC==8.4.4
2020
, GHC==8.6.5
2121
, GHC==8.8.4
22-
, GHC==8.10.3
22+
, GHC==8.10.7
2323
, GHC==9.0.1
2424
build-type: Simple
2525
extra-source-files:

0 commit comments

Comments
 (0)