Skip to content

Commit 2175f7b

Browse files
phadejphadej
authored
Merge pull request #541 from haskell-CI/ghcup-cabal-3.6
Support installing cabal-install ghcup even if GHC comes from hvr-ppa
2 parents f2e6ffa + 0e83e8f commit 2175f7b

24 files changed

+414
-352
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,15 @@ jobs:
6969
curl -sL https://downloads.haskell.org/ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2 > "$HOME/.ghcup/bin/ghcup"
7070
chmod a+x "$HOME/.ghcup/bin/ghcup"
7171
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
72-
"$HOME/.ghcup/bin/ghcup" install cabal 3.4.0.0
72+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.0.0
7373
else
7474
apt-add-repository -y 'ppa:hvr/ghc'
7575
apt-get update
76-
apt-get install -y "$HCNAME" cabal-install-3.4
76+
apt-get install -y "$HCNAME"
77+
mkdir -p "$HOME/.ghcup/bin"
78+
curl -sL https://downloads.haskell.org/ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2 > "$HOME/.ghcup/bin/ghcup"
79+
chmod a+x "$HOME/.ghcup/bin/ghcup"
80+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.0.0
7781
fi
7882
env:
7983
HCKIND: ${{ matrix.compilerKind }}
@@ -91,13 +95,13 @@ jobs:
9195
echo "HC=$HC" >> "$GITHUB_ENV"
9296
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
9397
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
94-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.4.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
98+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
9599
else
96100
HC=$HCDIR/bin/$HCKIND
97101
echo "HC=$HC" >> "$GITHUB_ENV"
98102
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
99103
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
100-
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> "$GITHUB_ENV"
104+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
101105
fi
102106
103107
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

‎fixtures/all-versions.github‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,11 @@ jobs:
275275
if [ $((GHCJSARITH)) -ne 0 ] ; then curl -sSL "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" | apt-key add - ; fi
276276
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'deb https://deb.nodesource.com/node_10.x bionic main' ; fi
277277
apt-get update
278-
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-get install -y "$HCNAME" cabal-install-3.4 ghc-8.4.4 nodejs ; else apt-get install -y "$HCNAME" cabal-install-3.4 ; fi
278+
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-get install -y "$HCNAME" ghc-8.4.4 nodejs ; else apt-get install -y "$HCNAME" ; fi
279+
mkdir -p "$HOME/.ghcup/bin"
280+
curl -sL https://downloads.haskell.org/ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2 > "$HOME/.ghcup/bin/ghcup"
281+
chmod a+x "$HOME/.ghcup/bin/ghcup"
282+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.0.0
279283
env:
280284
HCKIND: ${{ matrix.compilerKind }}
281285
HCNAME: ${{ matrix.compiler }}
@@ -292,7 +296,7 @@ jobs:
292296
echo "HC=$HC" >> "$GITHUB_ENV"
293297
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
294298
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
295-
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> "$GITHUB_ENV"
299+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
296300
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
297301
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
298302
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

‎fixtures/all-versions.travis‎

Lines changed: 44 additions & 44 deletions
Large diffs are not rendered by default.

‎fixtures/copy-fields-all.github‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,11 @@ jobs:
189189
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
190190
apt-add-repository -y 'ppa:hvr/ghc'
191191
apt-get update
192-
apt-get install -y "$HCNAME" cabal-install-3.4
192+
apt-get install -y "$HCNAME"
193+
mkdir -p "$HOME/.ghcup/bin"
194+
curl -sL https://downloads.haskell.org/ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2 > "$HOME/.ghcup/bin/ghcup"
195+
chmod a+x "$HOME/.ghcup/bin/ghcup"
196+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.0.0
193197
env:
194198
HCKIND: ${{ matrix.compilerKind }}
195199
HCNAME: ${{ matrix.compiler }}
@@ -205,7 +209,7 @@ jobs:
205209
echo "HC=$HC" >> "$GITHUB_ENV"
206210
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
207211
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
208-
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> "$GITHUB_ENV"
212+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
209213
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
210214
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
211215
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

0 commit comments

Comments
 (0)