Skip to content

Commit b115dc3

Browse files
jhrcekmichaelpj
andauthored
stack CI: switch to offic. haskell images, bump to lts-22.9 (ghc 9.6.4) (#4060)
* Bump to ghc 9.6.4 based lts-22.9 * Try more recent haskell image * Fool around * Cleanup and rename back to nightly --------- Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
1 parent d8445f4 commit b115dc3

File tree

3 files changed

+10
-34
lines changed

3 files changed

+10
-34
lines changed

.circleci/config.yml

+8-22
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
defaults: &defaults
22
working_directory: ~/build
3-
docker:
4-
- image: alanz/haskell-hie-ci
53
resource_class: large
64
steps:
75
- checkout
@@ -34,33 +32,18 @@ defaults: &defaults
3432
echo "export SKIP_CI=$SKIP_CI" >> $BASH_ENV
3533
3634
- run:
37-
name: Stack upgrade
35+
name: Build
3836
command: |
3937
if [[ -z "$SKIP_CI" ]]; then
40-
stack upgrade
41-
fi
42-
43-
- run:
44-
name: Stack setup
45-
command: |
46-
if [[ -z "$SKIP_CI" ]]; then
47-
stack -j4 --stack-yaml=${STACK_FILE} setup
48-
fi
49-
50-
- run:
51-
name: Build (we need the exe for tests)
52-
# need j1, else ghc-lib-parser triggers OOM
53-
command: |
54-
if [[ -z "$SKIP_CI" ]]; then
55-
stack -j4 --stack-yaml=${STACK_FILE} install --no-terminal
38+
stack -j4 --stack-yaml=${STACK_FILE} install --system-ghc --no-terminal
5639
fi
5740
no_output_timeout: 30m
5841

5942
- run:
6043
name: Build Testsuite without running it
6144
command: |
6245
if [[ -z "$SKIP_CI" ]]; then
63-
stack -j4 --stack-yaml=${STACK_FILE} build --test --no-run-tests --no-terminal
46+
stack -j4 --stack-yaml=${STACK_FILE} build --system-ghc --test --no-run-tests --no-terminal
6447
fi
6548
no_output_timeout: 30m
6649

@@ -70,22 +53,25 @@ defaults: &defaults
7053

7154
- save_cache:
7255
key: v4-stack-cache-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
73-
paths: &cache_paths
56+
paths:
7457
- ~/.stack
7558

7659
version: 2
7760
jobs:
7861
stackage-lts21:
62+
docker:
63+
- image: haskell:9.4.8-slim-buster
7964
environment:
8065
- STACK_FILE: "stack-lts21.yaml"
8166
<<: *defaults
8267

8368
stackage-nightly:
69+
docker:
70+
- image: haskell:9.6.4-slim-buster
8471
environment:
8572
- STACK_FILE: "stack.yaml"
8673
<<: *defaults
8774

88-
8975
workflows:
9076
version: 2
9177
multiple-ghcs:

stack-lts21.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-21.25 # ghc-9.4
1+
resolver: lts-21.25 # ghc-9.4.8
22

33
packages:
44
- .

stack.yaml

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2023-07-10 # ghc-9.6.2
1+
resolver: lts-22.9 # ghc-9.6.4
22

33
packages:
44
- .
@@ -20,25 +20,15 @@ extra-deps:
2020
- retrie-1.2.2
2121
- hiedb-0.5.0.1
2222
- implicit-hie-0.1.4.0
23-
- hie-bios-0.13.1
2423
- lsp-2.4.0.0
2524
- lsp-test-0.17.0.0
2625
- lsp-types-2.1.1.0
27-
- attoparsec-aeson-2.1.0.0
28-
- hw-fingertree-0.1.2.1
29-
- integer-conversion-0.1.0.1
3026
- monad-dijkstra-0.1.1.4
31-
- hw-prim-0.6.3.2
32-
- optparse-applicative-0.17.1.0
3327

3428
# stan and friends
3529
- stan-0.1.2.0
36-
- clay-0.14.0
37-
- colourista-0.1.0.2
3830
- dir-traverse-0.2.3.0
3931
- extensions-0.1.0.1
40-
- relude-1.2.1.0
41-
- slist-0.2.1.0
4232
- tomland-1.3.3.2
4333
- trial-0.0.0.0
4434
- trial-optparse-applicative-0.0.0.0

0 commit comments

Comments
 (0)