Skip to content

Commit 7db462c

Browse files
phadejphadej
committed
WIP
1 parent a1da297 commit 7db462c

21 files changed

+39
-450
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ jobs:
3535
compilerVersion: 9.10.1
3636
setup-method: ghcup
3737
allow-failure: false
38+
- compiler: ghc-9.8.3
39+
compilerKind: ghc
40+
compilerVersion: 9.8.3
41+
setup-method: ghcup
42+
allow-failure: false
3843
- compiler: ghc-9.8.2
3944
compilerKind: ghc
4045
compilerVersion: 9.8.2
@@ -90,20 +95,6 @@ jobs:
9095
run: |
9196
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9297
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
93-
- name: Install GHC (hvr-ppa)
94-
if: matrix.setup-method == 'hvr-ppa'
95-
run: |
96-
apt-add-repository -y 'ppa:hvr/ghc'
97-
apt-get update
98-
apt-get install -y "$HCNAME"
99-
HC=$HCDIR/bin/$HCKIND
100-
echo "HC=$HC" >> "$GITHUB_ENV"
101-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
102-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
103-
env:
104-
HCKIND: ${{ matrix.compilerKind }}
105-
HCNAME: ${{ matrix.compiler }}
106-
HCVER: ${{ matrix.compilerVersion }}
10798
- name: Install GHC (GHCup)
10899
if: matrix.setup-method == 'ghcup'
109100
run: |
@@ -132,21 +123,6 @@ jobs:
132123
HCKIND: ${{ matrix.compilerKind }}
133124
HCNAME: ${{ matrix.compiler }}
134125
HCVER: ${{ matrix.compilerVersion }}
135-
- name: Install GHC (GHCup prerelease)
136-
if: matrix.setup-method == 'ghcup-prerelease'
137-
run: |
138-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
139-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
140-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
141-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
142-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
143-
echo "HC=$HC" >> "$GITHUB_ENV"
144-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
145-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
146-
env:
147-
HCKIND: ${{ matrix.compilerKind }}
148-
HCNAME: ${{ matrix.compiler }}
149-
HCVER: ${{ matrix.compilerVersion }}
150126
- name: Set PATH and environment variables
151127
run: |
152128
echo "$HOME/.cabal/bin" >> $GITHUB_PATH

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.20
2+
3+
- Add support for GHCup vanilla and prerelease channels (in a more principled way)
4+
15
## 0.18.1 - 2024-02-25
26

37
- Add GHC-9.8.2

‎cabal-install-parsers/cabal-install-parsers.cabal‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ tested-with:
3333
|| ==9.4.8
3434
|| ==9.6.6
3535
|| ==9.8.2
36+
|| ==9.8.3
3637
|| ==9.10.1
3738

3839
extra-source-files:

‎fixtures/all-versions.github‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -313,20 +313,6 @@ jobs:
313313
run: |
314314
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
315315
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
316-
- name: Install GHC (hvr-ppa)
317-
if: matrix.setup-method == 'hvr-ppa'
318-
run: |
319-
apt-add-repository -y 'ppa:hvr/ghc'
320-
apt-get update
321-
apt-get install -y "$HCNAME"
322-
HC=$HCDIR/bin/$HCKIND
323-
echo "HC=$HC" >> "$GITHUB_ENV"
324-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
325-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
326-
env:
327-
HCKIND: ${{ matrix.compilerKind }}
328-
HCNAME: ${{ matrix.compiler }}
329-
HCVER: ${{ matrix.compilerVersion }}
330316
- name: Install GHC (GHCup)
331317
if: matrix.setup-method == 'ghcup'
332318
run: |

‎fixtures/copy-fields-all.github‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -163,20 +163,6 @@ jobs:
163163
run: |
164164
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165165
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
166-
- name: Install GHC (hvr-ppa)
167-
if: matrix.setup-method == 'hvr-ppa'
168-
run: |
169-
apt-add-repository -y 'ppa:hvr/ghc'
170-
apt-get update
171-
apt-get install -y "$HCNAME"
172-
HC=$HCDIR/bin/$HCKIND
173-
echo "HC=$HC" >> "$GITHUB_ENV"
174-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
175-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
176-
env:
177-
HCKIND: ${{ matrix.compilerKind }}
178-
HCNAME: ${{ matrix.compiler }}
179-
HCVER: ${{ matrix.compilerVersion }}
180166
- name: Install GHC (GHCup)
181167
if: matrix.setup-method == 'ghcup'
182168
run: |
@@ -191,35 +177,6 @@ jobs:
191177
HCKIND: ${{ matrix.compilerKind }}
192178
HCNAME: ${{ matrix.compiler }}
193179
HCVER: ${{ matrix.compilerVersion }}
194-
- name: Install GHC (GHCup vanilla)
195-
if: matrix.setup-method == 'ghcup-vanilla'
196-
run: |
197-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
198-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
199-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
200-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
201-
echo "HC=$HC" >> "$GITHUB_ENV"
202-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
203-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
204-
env:
205-
HCKIND: ${{ matrix.compilerKind }}
206-
HCNAME: ${{ matrix.compiler }}
207-
HCVER: ${{ matrix.compilerVersion }}
208-
- name: Install GHC (GHCup prerelease)
209-
if: matrix.setup-method == 'ghcup-prerelease'
210-
run: |
211-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
212-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
213-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
214-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
215-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
216-
echo "HC=$HC" >> "$GITHUB_ENV"
217-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
218-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
219-
env:
220-
HCKIND: ${{ matrix.compilerKind }}
221-
HCNAME: ${{ matrix.compiler }}
222-
HCVER: ${{ matrix.compilerVersion }}
223180
- name: Set PATH and environment variables
224181
run: |
225182
echo "$HOME/.cabal/bin" >> $GITHUB_PATH

‎fixtures/copy-fields-none.github‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -163,20 +163,6 @@ jobs:
163163
run: |
164164
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165165
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
166-
- name: Install GHC (hvr-ppa)
167-
if: matrix.setup-method == 'hvr-ppa'
168-
run: |
169-
apt-add-repository -y 'ppa:hvr/ghc'
170-
apt-get update
171-
apt-get install -y "$HCNAME"
172-
HC=$HCDIR/bin/$HCKIND
173-
echo "HC=$HC" >> "$GITHUB_ENV"
174-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
175-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
176-
env:
177-
HCKIND: ${{ matrix.compilerKind }}
178-
HCNAME: ${{ matrix.compiler }}
179-
HCVER: ${{ matrix.compilerVersion }}
180166
- name: Install GHC (GHCup)
181167
if: matrix.setup-method == 'ghcup'
182168
run: |
@@ -191,35 +177,6 @@ jobs:
191177
HCKIND: ${{ matrix.compilerKind }}
192178
HCNAME: ${{ matrix.compiler }}
193179
HCVER: ${{ matrix.compilerVersion }}
194-
- name: Install GHC (GHCup vanilla)
195-
if: matrix.setup-method == 'ghcup-vanilla'
196-
run: |
197-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
198-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
199-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
200-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
201-
echo "HC=$HC" >> "$GITHUB_ENV"
202-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
203-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
204-
env:
205-
HCKIND: ${{ matrix.compilerKind }}
206-
HCNAME: ${{ matrix.compiler }}
207-
HCVER: ${{ matrix.compilerVersion }}
208-
- name: Install GHC (GHCup prerelease)
209-
if: matrix.setup-method == 'ghcup-prerelease'
210-
run: |
211-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
212-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
213-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
214-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
215-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
216-
echo "HC=$HC" >> "$GITHUB_ENV"
217-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
218-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
219-
env:
220-
HCKIND: ${{ matrix.compilerKind }}
221-
HCNAME: ${{ matrix.compiler }}
222-
HCVER: ${{ matrix.compilerVersion }}
223180
- name: Set PATH and environment variables
224181
run: |
225182
echo "$HOME/.cabal/bin" >> $GITHUB_PATH

‎fixtures/copy-fields-some.github‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -163,20 +163,6 @@ jobs:
163163
run: |
164164
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165165
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
166-
- name: Install GHC (hvr-ppa)
167-
if: matrix.setup-method == 'hvr-ppa'
168-
run: |
169-
apt-add-repository -y 'ppa:hvr/ghc'
170-
apt-get update
171-
apt-get install -y "$HCNAME"
172-
HC=$HCDIR/bin/$HCKIND
173-
echo "HC=$HC" >> "$GITHUB_ENV"
174-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
175-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
176-
env:
177-
HCKIND: ${{ matrix.compilerKind }}
178-
HCNAME: ${{ matrix.compiler }}
179-
HCVER: ${{ matrix.compilerVersion }}
180166
- name: Install GHC (GHCup)
181167
if: matrix.setup-method == 'ghcup'
182168
run: |
@@ -191,35 +177,6 @@ jobs:
191177
HCKIND: ${{ matrix.compilerKind }}
192178
HCNAME: ${{ matrix.compiler }}
193179
HCVER: ${{ matrix.compilerVersion }}
194-
- name: Install GHC (GHCup vanilla)
195-
if: matrix.setup-method == 'ghcup-vanilla'
196-
run: |
197-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
198-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
199-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
200-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
201-
echo "HC=$HC" >> "$GITHUB_ENV"
202-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
203-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
204-
env:
205-
HCKIND: ${{ matrix.compilerKind }}
206-
HCNAME: ${{ matrix.compiler }}
207-
HCVER: ${{ matrix.compilerVersion }}
208-
- name: Install GHC (GHCup prerelease)
209-
if: matrix.setup-method == 'ghcup-prerelease'
210-
run: |
211-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
212-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
213-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
214-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
215-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
216-
echo "HC=$HC" >> "$GITHUB_ENV"
217-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
218-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
219-
env:
220-
HCKIND: ${{ matrix.compilerKind }}
221-
HCNAME: ${{ matrix.compiler }}
222-
HCVER: ${{ matrix.compilerVersion }}
223180
- name: Set PATH and environment variables
224181
run: |
225182
echo "$HOME/.cabal/bin" >> $GITHUB_PATH

‎fixtures/doctest-version.github‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -313,20 +313,6 @@ jobs:
313313
run: |
314314
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
315315
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
316-
- name: Install GHC (hvr-ppa)
317-
if: matrix.setup-method == 'hvr-ppa'
318-
run: |
319-
apt-add-repository -y 'ppa:hvr/ghc'
320-
apt-get update
321-
apt-get install -y "$HCNAME"
322-
HC=$HCDIR/bin/$HCKIND
323-
echo "HC=$HC" >> "$GITHUB_ENV"
324-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
325-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
326-
env:
327-
HCKIND: ${{ matrix.compilerKind }}
328-
HCNAME: ${{ matrix.compiler }}
329-
HCVER: ${{ matrix.compilerVersion }}
330316
- name: Install GHC (GHCup)
331317
if: matrix.setup-method == 'ghcup'
332318
run: |

‎fixtures/doctest.github‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -313,20 +313,6 @@ jobs:
313313
run: |
314314
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
315315
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
316-
- name: Install GHC (hvr-ppa)
317-
if: matrix.setup-method == 'hvr-ppa'
318-
run: |
319-
apt-add-repository -y 'ppa:hvr/ghc'
320-
apt-get update
321-
apt-get install -y "$HCNAME"
322-
HC=$HCDIR/bin/$HCKIND
323-
echo "HC=$HC" >> "$GITHUB_ENV"
324-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
325-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
326-
env:
327-
HCKIND: ${{ matrix.compilerKind }}
328-
HCNAME: ${{ matrix.compiler }}
329-
HCVER: ${{ matrix.compilerVersion }}
330316
- name: Install GHC (GHCup)
331317
if: matrix.setup-method == 'ghcup'
332318
run: |

‎fixtures/empty-line.github‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -163,20 +163,6 @@ jobs:
163163
run: |
164164
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165165
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
166-
- name: Install GHC (hvr-ppa)
167-
if: matrix.setup-method == 'hvr-ppa'
168-
run: |
169-
apt-add-repository -y 'ppa:hvr/ghc'
170-
apt-get update
171-
apt-get install -y "$HCNAME"
172-
HC=$HCDIR/bin/$HCKIND
173-
echo "HC=$HC" >> "$GITHUB_ENV"
174-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
175-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
176-
env:
177-
HCKIND: ${{ matrix.compilerKind }}
178-
HCNAME: ${{ matrix.compiler }}
179-
HCVER: ${{ matrix.compilerVersion }}
180166
- name: Install GHC (GHCup)
181167
if: matrix.setup-method == 'ghcup'
182168
run: |
@@ -191,20 +177,6 @@ jobs:
191177
HCKIND: ${{ matrix.compilerKind }}
192178
HCNAME: ${{ matrix.compiler }}
193179
HCVER: ${{ matrix.compilerVersion }}
194-
- name: Install GHC (GHCup vanilla)
195-
if: matrix.setup-method == 'ghcup-vanilla'
196-
run: |
197-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
198-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
199-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
200-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
201-
echo "HC=$HC" >> "$GITHUB_ENV"
202-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
203-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
204-
env:
205-
HCKIND: ${{ matrix.compilerKind }}
206-
HCNAME: ${{ matrix.compiler }}
207-
HCVER: ${{ matrix.compilerVersion }}
208180
- name: Install GHC (GHCup prerelease)
209181
if: matrix.setup-method == 'ghcup-prerelease'
210182
run: |

0 commit comments

Comments
 (0)