Skip to content

Commit bf71dcd

Browse files
Simplify Stack CI (#2579)
For Stack CI, GHC doesn't need to be installed globally; only the version installed by Stack is actually used. Also bump to the latest LTS'es.
1 parent 9bfca00 commit bf71dcd

File tree

3 files changed

+13
-21
lines changed

3 files changed

+13
-21
lines changed

.ci/stack-9.2.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-20.25
1+
resolver: lts-20.26
22

33
ghc-options:
44
"$locals": -Wall -Wcompat
@@ -13,8 +13,7 @@ packages:
1313
- tests
1414

1515
extra-deps:
16-
- concurrent-supply-0.1.8@sha256:9373f4868ad28936a7b93781b214ef4afdeacf377ef4ac729583073491c9f9fb,1627
17-
- hashable-1.3.5.0@sha256:3a2beeafb220f9de706568a7e4a5b3c762cc4c9f25c94d7ef795b8c2d6a691d7,4240
18-
- prettyprinter-interp-0.2.0.0@sha256:45299b61bd6c27d594c1a72b5a8dd5734e791a59828725e4f4e420f3cc37232b,2016
16+
- concurrent-supply-0.1.8@sha256:80b658533141660818d0781b8c8fb9a8cf69b987fcfbab782dc788bfc7df4846,1627
17+
- prettyprinter-interp-0.2.0.0@sha256:7072e659fb902cbcab790c9cca2b0739f9f4b81b666a63f2140139950f05025d,2086
1918
- infinite-list-0.1@sha256:4de250517ce75e128c766fbc1f23b5a778ea964e695e47f8e83e0f3b293091bf,2383
2019
- tasty-1.5@sha256:c62c96da1e9d65bf61ce583e9f7085eed1daeb62a45f3106ca252bf9ef87025b,2763

.ci/stack-9.4.yaml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2023-06-13
1+
resolver: lts-21.12
22

33
ghc-options:
44
"$locals": -Wall -Wcompat
@@ -12,14 +12,9 @@ packages:
1212
- clash-cores
1313
- tests
1414

15-
allow-newer: true
16-
1715
extra-deps:
18-
- concurrent-supply-0.1.8@sha256:9373f4868ad28936a7b93781b214ef4afdeacf377ef4ac729583073491c9f9fb,1627
19-
- string-interpolate-0.3.1.2@sha256:4d0987f453c66040aa8e482fe28a7d3cdc9d8df01b698bc92f42a592cfb337db,4268
20-
- prettyprinter-interp-0.2.0.0@sha256:45299b61bd6c27d594c1a72b5a8dd5734e791a59828725e4f4e420f3cc37232b,2016
21-
- infinite-list-0.1@sha256:4de250517ce75e128c766fbc1f23b5a778ea964e695e47f8e83e0f3b293091bf,2383
22-
- hashable-1.4.1.0
16+
- concurrent-supply-0.1.8@sha256:80b658533141660818d0781b8c8fb9a8cf69b987fcfbab782dc788bfc7df4846,1627
17+
- prettyprinter-interp-0.2.0.0@sha256:7072e659fb902cbcab790c9cca2b0739f9f4b81b666a63f2140139950f05025d,2086
2318
- git: https://github.com/christiaanb/hint.git
2419
commit: 7803c34c8ae1d83c0f7c13fe6b30fcb3abd0ac51
2520
- tasty-1.5@sha256:c62c96da1e9d65bf61ce583e9f7085eed1daeb62a45f3106ca252bf9ef87025b,2763

.github/workflows/ci.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,29 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
os: ["macOS", "windows"]
24-
ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.5"]
24+
ghc: ["8.6", "8.8", "8.10", "9.0", "9.2", "9.4"]
2525
exclude:
2626
# Some tests fail with a mysterious -11 error code.
2727
- os: macOS
28-
ghc: 8.10.7
28+
ghc: 8.10
2929

3030
# Windows gets non-deterministically gets stuck in infinite loops
3131
# or segfaults while running the testcase.
3232
- os: windows
33-
ghc: 8.8.4
33+
ghc: 8.8
3434

35-
# GHC 9.0.2 fails to compile clash-cores due to a template haskell
35+
# GHC 9.0 fails to compile clash-cores due to a template haskell
3636
# failure
3737
- os: windows
38-
ghc: 9.0.2
38+
ghc: 9.0
3939

4040
steps:
4141
- uses: actions/checkout@v3
4242
- uses: haskell/actions/setup@v2
4343
id: setup-haskell
4444
with:
45-
ghc-version: ${{ matrix.ghc }}
4645
enable-stack: true
46+
stack-no-global: true
4747

4848
- name: Install IVerilog (macOS)
4949
if: matrix.os == 'macOS'
@@ -56,9 +56,7 @@ jobs:
5656
- name: General Setup
5757
shell: bash
5858
run: |
59-
declare GHC_VERSION=${{ matrix.ghc }}
60-
# Rewrite an argument of the form X.Y.Z to X.Y
61-
cp .ci/stack-${GHC_VERSION%.*}.yaml stack.yaml
59+
cp .ci/stack-${{ matrix.ghc }}.yaml stack.yaml
6260
# Print out stack.yaml for debugging purposes
6361
cat stack.yaml
6462

0 commit comments

Comments
 (0)