Skip to content

Commit 67f6ff5

Browse files
phadejphadej
committed
WIP
1 parent 3256442 commit 67f6ff5

15 files changed

+247
-245
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ jobs:
8989
- name: Install cabal-install
9090
run: |
9191
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
92+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
9293
- name: Install GHC (hvr-ppa)
9394
if: matrix.setup-method == 'hvr-ppa'
9495
run: |
@@ -101,6 +102,12 @@ jobs:
101102
if: matrix.setup-method == 'ghcup'
102103
run: |
103104
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
105+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
106+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
107+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
108+
echo "HC=$HC" >> "$GITHUB_ENV"
109+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
110+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
104111
env:
105112
HCKIND: ${{ matrix.compilerKind }}
106113
HCNAME: ${{ matrix.compiler }}
@@ -112,13 +119,6 @@ jobs:
112119
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
113120
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
114121
HCDIR=/opt/$HCKIND/$HCVER
115-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
116-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
117-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
118-
echo "HC=$HC" >> "$GITHUB_ENV"
119-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
120-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
121-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
122122
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
123123
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
124124
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

‎fixtures/all-versions.github‎

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -325,20 +325,25 @@ jobs:
325325
- name: Install cabal-install
326326
run: |
327327
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
328-
- name: TODO
328+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
329+
- name: Install GHC (hvr-ppa)
330+
if: matrix.setup-method == 'hvr-ppa'
329331
run: |
330-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
331-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
332-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
333-
else
334-
apt-add-repository -y 'ppa:hvr/ghc'
335-
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'ppa:hvr/ghcjs' ; fi
336-
if [ $((GHCJSARITH)) -ne 0 ] ; then curl -sSL "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" | apt-key add - ; fi
337-
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'deb https://deb.nodesource.com/node_10.x jammy main' ; fi
338-
apt-get update
339-
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-get install -y "$HCNAME" ghc-8.4.4 nodejs ; else apt-get install -y "$HCNAME" ; fi
340-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
341-
fi
332+
echo true
333+
env:
334+
HCKIND: ${{ matrix.compilerKind }}
335+
HCNAME: ${{ matrix.compiler }}
336+
HCVER: ${{ matrix.compilerVersion }}
337+
- name: Install GHC (GHCup)
338+
if: matrix.setup-method == 'ghcup'
339+
run: |
340+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
341+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
342+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
343+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
344+
echo "HC=$HC" >> "$GITHUB_ENV"
345+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
346+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
342347
env:
343348
HCKIND: ${{ matrix.compilerKind }}
344349
HCNAME: ${{ matrix.compiler }}
@@ -351,22 +356,6 @@ jobs:
351356
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
352357
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
353358
HCDIR=/opt/$HCKIND/$HCVER
354-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
355-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
356-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
357-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
358-
echo "HC=$HC" >> "$GITHUB_ENV"
359-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
360-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
361-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
362-
else
363-
HC=$HCDIR/bin/$HCKIND
364-
echo "HC=$HC" >> "$GITHUB_ENV"
365-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
366-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
367-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
368-
fi
369-
370359
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
371360
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
372361
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

‎fixtures/copy-fields-all.github‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,25 @@ jobs:
162162
- name: Install cabal-install
163163
run: |
164164
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165-
- name: TODO
165+
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+
echo true
170+
env:
171+
HCKIND: ${{ matrix.compilerKind }}
172+
HCNAME: ${{ matrix.compiler }}
173+
HCVER: ${{ matrix.compilerVersion }}
174+
- name: Install GHC (GHCup)
175+
if: matrix.setup-method == 'ghcup'
166176
run: |
167-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
168177
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
178+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
179+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
180+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
181+
echo "HC=$HC" >> "$GITHUB_ENV"
182+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
183+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
169184
env:
170185
HCKIND: ${{ matrix.compilerKind }}
171186
HCNAME: ${{ matrix.compiler }}
@@ -177,13 +192,6 @@ jobs:
177192
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
178193
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
179194
HCDIR=/opt/$HCKIND/$HCVER
180-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
181-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
182-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
183-
echo "HC=$HC" >> "$GITHUB_ENV"
184-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
185-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
186-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
187195
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
188196
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
189197
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

‎fixtures/copy-fields-none.github‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,25 @@ jobs:
162162
- name: Install cabal-install
163163
run: |
164164
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165-
- name: TODO
165+
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+
echo true
170+
env:
171+
HCKIND: ${{ matrix.compilerKind }}
172+
HCNAME: ${{ matrix.compiler }}
173+
HCVER: ${{ matrix.compilerVersion }}
174+
- name: Install GHC (GHCup)
175+
if: matrix.setup-method == 'ghcup'
166176
run: |
167-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
168177
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
178+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
179+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
180+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
181+
echo "HC=$HC" >> "$GITHUB_ENV"
182+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
183+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
169184
env:
170185
HCKIND: ${{ matrix.compilerKind }}
171186
HCNAME: ${{ matrix.compiler }}
@@ -177,13 +192,6 @@ jobs:
177192
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
178193
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
179194
HCDIR=/opt/$HCKIND/$HCVER
180-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
181-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
182-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
183-
echo "HC=$HC" >> "$GITHUB_ENV"
184-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
185-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
186-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
187195
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
188196
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
189197
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

‎fixtures/copy-fields-some.github‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,25 @@ jobs:
162162
- name: Install cabal-install
163163
run: |
164164
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
165-
- name: TODO
165+
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+
echo true
170+
env:
171+
HCKIND: ${{ matrix.compilerKind }}
172+
HCNAME: ${{ matrix.compiler }}
173+
HCVER: ${{ matrix.compilerVersion }}
174+
- name: Install GHC (GHCup)
175+
if: matrix.setup-method == 'ghcup'
166176
run: |
167-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
168177
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
178+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
179+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
180+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
181+
echo "HC=$HC" >> "$GITHUB_ENV"
182+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
183+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
169184
env:
170185
HCKIND: ${{ matrix.compilerKind }}
171186
HCNAME: ${{ matrix.compiler }}
@@ -177,13 +192,6 @@ jobs:
177192
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
178193
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
179194
HCDIR=/opt/$HCKIND/$HCVER
180-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
181-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
182-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
183-
echo "HC=$HC" >> "$GITHUB_ENV"
184-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
185-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
186-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
187195
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
188196
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
189197
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

‎fixtures/doctest-version.github‎

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -325,20 +325,25 @@ jobs:
325325
- name: Install cabal-install
326326
run: |
327327
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
328-
- name: TODO
328+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
329+
- name: Install GHC (hvr-ppa)
330+
if: matrix.setup-method == 'hvr-ppa'
329331
run: |
330-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
331-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
332-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
333-
else
334-
apt-add-repository -y 'ppa:hvr/ghc'
335-
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'ppa:hvr/ghcjs' ; fi
336-
if [ $((GHCJSARITH)) -ne 0 ] ; then curl -sSL "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" | apt-key add - ; fi
337-
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'deb https://deb.nodesource.com/node_10.x jammy main' ; fi
338-
apt-get update
339-
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-get install -y "$HCNAME" ghc-8.4.4 nodejs ; else apt-get install -y "$HCNAME" ; fi
340-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
341-
fi
332+
echo true
333+
env:
334+
HCKIND: ${{ matrix.compilerKind }}
335+
HCNAME: ${{ matrix.compiler }}
336+
HCVER: ${{ matrix.compilerVersion }}
337+
- name: Install GHC (GHCup)
338+
if: matrix.setup-method == 'ghcup'
339+
run: |
340+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
341+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
342+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
343+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
344+
echo "HC=$HC" >> "$GITHUB_ENV"
345+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
346+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
342347
env:
343348
HCKIND: ${{ matrix.compilerKind }}
344349
HCNAME: ${{ matrix.compiler }}
@@ -351,22 +356,6 @@ jobs:
351356
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
352357
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
353358
HCDIR=/opt/$HCKIND/$HCVER
354-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
355-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
356-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
357-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
358-
echo "HC=$HC" >> "$GITHUB_ENV"
359-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
360-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
361-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
362-
else
363-
HC=$HCDIR/bin/$HCKIND
364-
echo "HC=$HC" >> "$GITHUB_ENV"
365-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
366-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
367-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
368-
fi
369-
370359
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
371360
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
372361
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

‎fixtures/doctest.github‎

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -325,20 +325,25 @@ jobs:
325325
- name: Install cabal-install
326326
run: |
327327
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
328-
- name: TODO
328+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
329+
- name: Install GHC (hvr-ppa)
330+
if: matrix.setup-method == 'hvr-ppa'
329331
run: |
330-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
331-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
332-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
333-
else
334-
apt-add-repository -y 'ppa:hvr/ghc'
335-
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'ppa:hvr/ghcjs' ; fi
336-
if [ $((GHCJSARITH)) -ne 0 ] ; then curl -sSL "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" | apt-key add - ; fi
337-
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'deb https://deb.nodesource.com/node_10.x jammy main' ; fi
338-
apt-get update
339-
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-get install -y "$HCNAME" ghc-8.4.4 nodejs ; else apt-get install -y "$HCNAME" ; fi
340-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
341-
fi
332+
echo true
333+
env:
334+
HCKIND: ${{ matrix.compilerKind }}
335+
HCNAME: ${{ matrix.compiler }}
336+
HCVER: ${{ matrix.compilerVersion }}
337+
- name: Install GHC (GHCup)
338+
if: matrix.setup-method == 'ghcup'
339+
run: |
340+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
341+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
342+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
343+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
344+
echo "HC=$HC" >> "$GITHUB_ENV"
345+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
346+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
342347
env:
343348
HCKIND: ${{ matrix.compilerKind }}
344349
HCNAME: ${{ matrix.compiler }}
@@ -351,22 +356,6 @@ jobs:
351356
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
352357
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
353358
HCDIR=/opt/$HCKIND/$HCVER
354-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
355-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
356-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
357-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
358-
echo "HC=$HC" >> "$GITHUB_ENV"
359-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
360-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
361-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
362-
else
363-
HC=$HCDIR/bin/$HCKIND
364-
echo "HC=$HC" >> "$GITHUB_ENV"
365-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
366-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
367-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
368-
fi
369-
370359
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
371360
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
372361
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

0 commit comments

Comments
 (0)