Skip to content

Commit 106c99a

Browse files
committed
Switch to official docker images for CI
phadej's images use hvr's ppa, which stops at ghc 9.0
1 parent 3ea1bdf commit 106c99a

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.github/workflows/linux.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-18.04
2121
needs: validate-8_8_4
2222
container:
23-
image: phadej/ghc:9.2.1-bionic
23+
image: haskell:9.2.1
2424
steps:
2525
- name: System info
2626
run: |
@@ -70,7 +70,7 @@ jobs:
7070
runs-on: ubuntu-18.04
7171
needs: validate-8_8_4
7272
container:
73-
image: phadej/ghc:9.0.2-bionic
73+
image: haskell:9.0.2
7474
steps:
7575
- name: System info
7676
run: |
@@ -120,7 +120,7 @@ jobs:
120120
runs-on: ubuntu-18.04
121121
needs: validate-8_8_4
122122
container:
123-
image: phadej/ghc:8.10.7-bionic
123+
image: haskell:8.10.7
124124
steps:
125125
- name: System info
126126
run: |
@@ -169,7 +169,7 @@ jobs:
169169
name: validate.sh ghc-8.8.4
170170
runs-on: ubuntu-18.04
171171
container:
172-
image: phadej/ghc:8.8.4-bionic
172+
image: haskell:8.8.4
173173
steps:
174174
- name: System info
175175
run: |
@@ -219,7 +219,7 @@ jobs:
219219
runs-on: ubuntu-18.04
220220
needs: validate-8_8_4
221221
container:
222-
image: phadej/ghc:8.6.5-bionic
222+
image: haskell:8.6.5
223223
steps:
224224
- name: System info
225225
run: |
@@ -269,7 +269,7 @@ jobs:
269269
runs-on: ubuntu-18.04
270270
needs: validate-8_8_4
271271
container:
272-
image: phadej/ghc:8.4.4-bionic
272+
image: haskell:8.4.4
273273
steps:
274274
- name: System info
275275
run: |
@@ -319,7 +319,7 @@ jobs:
319319
runs-on: ubuntu-18.04
320320
needs: validate-8_8_4
321321
container:
322-
image: phadej/ghc:8.2.2-bionic
322+
image: haskell:8.2.2
323323
steps:
324324
- name: System info
325325
run: |
@@ -369,7 +369,7 @@ jobs:
369369
runs-on: ubuntu-18.04
370370
needs: validate-8_8_4
371371
container:
372-
image: phadej/ghc:8.0.2-bionic
372+
image: haskell:8.0.2
373373
steps:
374374
- name: System info
375375
run: |
@@ -411,7 +411,7 @@ jobs:
411411
runs-on: ubuntu-18.04
412412
needs: validate-8_8_4
413413
container:
414-
image: phadej/ghc:7.10.3-bionic
414+
image: haskell:7.10.3
415415
steps:
416416
- name: System info
417417
run: |
@@ -453,7 +453,7 @@ jobs:
453453
runs-on: ubuntu-18.04
454454
needs: validate-8_8_4
455455
container:
456-
image: phadej/ghc:7.8.4-bionic
456+
image: haskell:7.8.4
457457
steps:
458458
- name: System info
459459
run: |
@@ -495,7 +495,7 @@ jobs:
495495
runs-on: ubuntu-18.04
496496
needs: validate-8_8_4
497497
container:
498-
image: phadej/ghc:7.6.3-xenial
498+
image: haskell:7.6.3
499499
steps:
500500
- name: System info
501501
run: |
@@ -541,7 +541,7 @@ jobs:
541541
runs-on: ubuntu-18.04
542542
needs: validate-8_8_4
543543
container:
544-
image: phadej/ghc:8.8.4-xenial
544+
image: haskell:8.8.4
545545
steps:
546546
- name: System info
547547
run: |

templates/ci-linux.template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
needs: validate-{{ mangleVersion needs }}
2424
{% endfor %}
2525
container:
26-
image: phadej/ghc:{{job.version}}-{% if job.xenial %}xenial{% else %}bionic{% endif %}
26+
image: haskell:{{job.version}}
2727
steps:
2828
- name: System info
2929
run: |

0 commit comments

Comments
 (0)