Skip to content

Commit 7c9b7cc

Browse files
committed
Fool around
1 parent 342168f commit 7c9b7cc

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

.circleci/config.yml

+6-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
defaults: &defaults
22
working_directory: ~/build
3-
docker:
4-
- image: haskell:9.6.4-slim-buster
53
resource_class: large
64
steps:
75
- checkout
@@ -33,34 +31,20 @@ defaults: &defaults
3331
fi
3432
echo "export SKIP_CI=$SKIP_CI" >> $BASH_ENV
3533
36-
- run:
37-
name: Stack upgrade
38-
command: |
39-
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-
5034
- run:
5135
name: Build (we need the exe for tests)
5236
# need j1, else ghc-lib-parser triggers OOM
5337
command: |
5438
if [[ -z "$SKIP_CI" ]]; then
55-
stack -j4 --stack-yaml=${STACK_FILE} install --no-terminal
39+
stack -j4 --stack-yaml=${STACK_FILE} install --system-ghc --no-terminal
5640
fi
5741
no_output_timeout: 30m
5842

5943
- run:
6044
name: Build Testsuite without running it
6145
command: |
6246
if [[ -z "$SKIP_CI" ]]; then
63-
stack -j4 --stack-yaml=${STACK_FILE} build --test --no-run-tests --no-terminal
47+
stack -j4 --stack-yaml=${STACK_FILE} build --system-ghc --test --no-run-tests --no-terminal
6448
fi
6549
no_output_timeout: 30m
6650

@@ -76,11 +60,15 @@ defaults: &defaults
7660
version: 2
7761
jobs:
7862
stackage-lts21:
63+
docker:
64+
- image: haskell:9.4.8-slim-buster
7965
environment:
8066
- STACK_FILE: "stack-lts21.yaml"
8167
<<: *defaults
8268

8369
stackage-lts22:
70+
docker:
71+
- image: haskell:9.6.4-slim-buster
8472
environment:
8573
- STACK_FILE: "stack.yaml"
8674
<<: *defaults

0 commit comments

Comments
 (0)