Skip to content

Commit 84b6e60

Browse files
phadejphadej
authored
Merge pull request #777 from haskell-CI/cabal-install-3.14.2.0
Use cabal-install-3.14.2.0
2 parents f0fd898 + 78cf1c7 commit 84b6e60

16 files changed

+31
-29
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ jobs:
8888
chmod a+x "$HOME/.ghcup/bin/ghcup"
8989
- name: Install cabal-install
9090
run: |
91-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
92-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
91+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
92+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
9393
- name: Install GHC (GHCup)
9494
if: matrix.setup-method == 'ghcup'
9595
run: |

‎fixtures/all-versions.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,8 @@ jobs:
321321
chmod a+x "$HOME/.ghcup/bin/ghcup"
322322
- name: Install cabal-install
323323
run: |
324-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
325-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
324+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
325+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
326326
- name: Install GHC (GHCup)
327327
if: matrix.setup-method == 'ghcup'
328328
run: |

‎fixtures/copy-fields-all.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ jobs:
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162162
- name: Install cabal-install
163163
run: |
164-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
165-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
164+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
166166
- name: Install GHC (GHCup)
167167
if: matrix.setup-method == 'ghcup'
168168
run: |

‎fixtures/copy-fields-none.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ jobs:
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162162
- name: Install cabal-install
163163
run: |
164-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
165-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
164+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
166166
- name: Install GHC (GHCup)
167167
if: matrix.setup-method == 'ghcup'
168168
run: |

‎fixtures/copy-fields-some.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ jobs:
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162162
- name: Install cabal-install
163163
run: |
164-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
165-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
164+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
166166
- name: Install GHC (GHCup)
167167
if: matrix.setup-method == 'ghcup'
168168
run: |

‎fixtures/doctest-version.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,8 @@ jobs:
321321
chmod a+x "$HOME/.ghcup/bin/ghcup"
322322
- name: Install cabal-install
323323
run: |
324-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
325-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
324+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
325+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
326326
- name: Install GHC (GHCup)
327327
if: matrix.setup-method == 'ghcup'
328328
run: |

‎fixtures/doctest.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,8 @@ jobs:
321321
chmod a+x "$HOME/.ghcup/bin/ghcup"
322322
- name: Install cabal-install
323323
run: |
324-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
325-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
324+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
325+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
326326
- name: Install GHC (GHCup)
327327
if: matrix.setup-method == 'ghcup'
328328
run: |

‎fixtures/empty-line.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ jobs:
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162162
- name: Install cabal-install
163163
run: |
164-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
165-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
164+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
166166
- name: Install GHC (GHCup)
167167
if: matrix.setup-method == 'ghcup'
168168
run: |

‎fixtures/enabled-jobs.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,8 @@ jobs:
321321
chmod a+x "$HOME/.ghcup/bin/ghcup"
322322
- name: Install cabal-install
323323
run: |
324-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
325-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
324+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
325+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
326326
- name: Install GHC (GHCup)
327327
if: matrix.setup-method == 'ghcup'
328328
run: |

‎fixtures/fail-versions.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ jobs:
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162162
- name: Install cabal-install
163163
run: |
164-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
165-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
164+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
166166
- name: Install GHC (GHCup)
167167
if: matrix.setup-method == 'ghcup'
168168
run: |

‎fixtures/irc-channels.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ jobs:
188188
chmod a+x "$HOME/.ghcup/bin/ghcup"
189189
- name: Install cabal-install
190190
run: |
191-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
192-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
191+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
192+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
193193
- name: Install GHC (GHCup)
194194
if: matrix.setup-method == 'ghcup'
195195
run: |

‎fixtures/messy.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ jobs:
162162
chmod a+x "$HOME/.ghcup/bin/ghcup"
163163
- name: Install cabal-install
164164
run: |
165-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
166-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
165+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
166+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
167167
- name: Install GHC (GHCup)
168168
if: matrix.setup-method == 'ghcup'
169169
run: |

‎fixtures/psql.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ jobs:
167167
chmod a+x "$HOME/.ghcup/bin/ghcup"
168168
- name: Install cabal-install
169169
run: |
170-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
171-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
170+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
171+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
172172
- name: Install GHC (GHCup)
173173
if: matrix.setup-method == 'ghcup'
174174
run: |

‎fixtures/travis-patch.github

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ jobs:
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162162
- name: Install cabal-install
163163
run: |
164-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
165-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
164+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
166166
- name: Install GHC (GHCup)
167167
if: matrix.setup-method == 'ghcup'
168168
run: |

‎haskell-ci.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: haskell-ci
3-
version: 0.19.20250330
3+
version: 0.19.20250411
44
synopsis: Haskell CI script generator
55
description:
66
Script generator (@haskell-ci@) for

‎src/HaskellCI/Config/History.hs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ configHistory =
7878
& field @"cfgGhcupVersion" .~ C.mkVersion [0,1,50,1]
7979
, ver 0 19 20250330 := \cfg -> cfg
8080
& field @"cfgCabalInstallVersion" ?~ C.mkVersion [3,14,1,1]
81+
, ver 0 19 20250330 := \cfg -> cfg
82+
& field @"cfgCabalInstallVersion" ?~ C.mkVersion [3,14,2,0]
8183
]
8284
where
8385
ver x y z = [x, y, z]

0 commit comments

Comments
 (0)