Skip to content

Commit 3f84112

Browse files
phadejphadej
committed
Install cabla-install
1 parent 06eecf3 commit 3f84112

16 files changed

+85
-61
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,13 @@ jobs:
8686
mkdir -p "$HOME/.ghcup/bin"
8787
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
8888
chmod a+x "$HOME/.ghcup/bin/ghcup"
89+
- name: Install cabal-install
90+
run: |
91+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8992
- name: TODO
9093
run: |
9194
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
9295
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
93-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9496
env:
9597
HCKIND: ${{ matrix.compilerKind }}
9698
HCNAME: ${{ matrix.compiler }}
@@ -187,8 +189,8 @@ jobs:
187189
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.22.0' ; fi
188190
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi
189191
- name: save cache (tools)
190-
uses: actions/cache/save@v4
191192
if: always()
193+
uses: actions/cache/save@v4
192194
with:
193195
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-4fd5cdc7
194196
path: ~/.haskell-ci-tools
@@ -293,8 +295,8 @@ jobs:
293295
run: |
294296
rm -f cabal.project.local
295297
- name: save cache
296-
uses: actions/cache/save@v4
297298
if: always()
299+
uses: actions/cache/save@v4
298300
with:
299301
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
300302
path: ~/.cabal/store

‎fixtures/all-versions.github‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,14 @@ jobs:
322322
mkdir -p "$HOME/.ghcup/bin"
323323
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
324324
chmod a+x "$HOME/.ghcup/bin/ghcup"
325+
- name: Install cabal-install
326+
run: |
327+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
325328
- name: TODO
326329
run: |
327330
if [ "${{ matrix.setup-method }}" = ghcup ]; then
328331
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
329332
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
330-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
331333
else
332334
apt-add-repository -y 'ppa:hvr/ghc'
333335
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'ppa:hvr/ghcjs' ; fi
@@ -336,7 +338,6 @@ jobs:
336338
apt-get update
337339
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-get install -y "$HCNAME" ghc-8.4.4 nodejs ; else apt-get install -y "$HCNAME" ; fi
338340
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
339-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
340341
fi
341342
env:
342343
HCKIND: ${{ matrix.compilerKind }}
@@ -504,8 +505,8 @@ jobs:
504505
rm -f cabal.project.local
505506
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
506507
- name: save cache
507-
uses: actions/cache/save@v4
508508
if: always()
509+
uses: actions/cache/save@v4
509510
with:
510511
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
511512
path: ~/.cabal/store

‎fixtures/copy-fields-all.github‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,13 @@ jobs:
159159
mkdir -p "$HOME/.ghcup/bin"
160160
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162+
- name: Install cabal-install
163+
run: |
164+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
162165
- name: TODO
163166
run: |
164167
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
165168
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
166-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
167169
env:
168170
HCKIND: ${{ matrix.compilerKind }}
169171
HCNAME: ${{ matrix.compiler }}
@@ -339,8 +341,8 @@ jobs:
339341
rm -f cabal.project.local
340342
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
341343
- name: save cache
342-
uses: actions/cache/save@v4
343344
if: always()
345+
uses: actions/cache/save@v4
344346
with:
345347
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
346348
path: ~/.cabal/store

‎fixtures/copy-fields-none.github‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,13 @@ jobs:
159159
mkdir -p "$HOME/.ghcup/bin"
160160
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162+
- name: Install cabal-install
163+
run: |
164+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
162165
- name: TODO
163166
run: |
164167
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
165168
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
166-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
167169
env:
168170
HCKIND: ${{ matrix.compilerKind }}
169171
HCNAME: ${{ matrix.compiler }}
@@ -328,8 +330,8 @@ jobs:
328330
rm -f cabal.project.local
329331
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
330332
- name: save cache
331-
uses: actions/cache/save@v4
332333
if: always()
334+
uses: actions/cache/save@v4
333335
with:
334336
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
335337
path: ~/.cabal/store

‎fixtures/copy-fields-some.github‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,13 @@ jobs:
159159
mkdir -p "$HOME/.ghcup/bin"
160160
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162+
- name: Install cabal-install
163+
run: |
164+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
162165
- name: TODO
163166
run: |
164167
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
165168
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
166-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
167169
env:
168170
HCKIND: ${{ matrix.compilerKind }}
169171
HCNAME: ${{ matrix.compiler }}
@@ -331,8 +333,8 @@ jobs:
331333
rm -f cabal.project.local
332334
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
333335
- name: save cache
334-
uses: actions/cache/save@v4
335336
if: always()
337+
uses: actions/cache/save@v4
336338
with:
337339
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
338340
path: ~/.cabal/store

‎fixtures/doctest-version.github‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,14 @@ jobs:
322322
mkdir -p "$HOME/.ghcup/bin"
323323
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
324324
chmod a+x "$HOME/.ghcup/bin/ghcup"
325+
- name: Install cabal-install
326+
run: |
327+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
325328
- name: TODO
326329
run: |
327330
if [ "${{ matrix.setup-method }}" = ghcup ]; then
328331
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
329332
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
330-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
331333
else
332334
apt-add-repository -y 'ppa:hvr/ghc'
333335
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'ppa:hvr/ghcjs' ; fi
@@ -336,7 +338,6 @@ jobs:
336338
apt-get update
337339
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-get install -y "$HCNAME" ghc-8.4.4 nodejs ; else apt-get install -y "$HCNAME" ; fi
338340
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
339-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
340341
fi
341342
env:
342343
HCKIND: ${{ matrix.compilerKind }}
@@ -444,8 +445,8 @@ jobs:
444445
if [ $((! GHCJSARITH)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi
445446
if [ $((! GHCJSARITH)) -ne 0 ] ; then doctest --version ; fi
446447
- name: save cache (tools)
447-
uses: actions/cache/save@v4
448448
if: always()
449+
uses: actions/cache/save@v4
449450
with:
450451
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-9ea05c43
451452
path: ~/.haskell-ci-tools
@@ -523,8 +524,8 @@ jobs:
523524
rm -f cabal.project.local
524525
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
525526
- name: save cache
526-
uses: actions/cache/save@v4
527527
if: always()
528+
uses: actions/cache/save@v4
528529
with:
529530
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
530531
path: ~/.cabal/store

‎fixtures/doctest.github‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,14 @@ jobs:
322322
mkdir -p "$HOME/.ghcup/bin"
323323
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
324324
chmod a+x "$HOME/.ghcup/bin/ghcup"
325+
- name: Install cabal-install
326+
run: |
327+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
325328
- name: TODO
326329
run: |
327330
if [ "${{ matrix.setup-method }}" = ghcup ]; then
328331
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
329332
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
330-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
331333
else
332334
apt-add-repository -y 'ppa:hvr/ghc'
333335
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'ppa:hvr/ghcjs' ; fi
@@ -336,7 +338,6 @@ jobs:
336338
apt-get update
337339
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-get install -y "$HCNAME" ghc-8.4.4 nodejs ; else apt-get install -y "$HCNAME" ; fi
338340
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
339-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
340341
fi
341342
env:
342343
HCKIND: ${{ matrix.compilerKind }}
@@ -444,8 +445,8 @@ jobs:
444445
if [ $((! GHCJSARITH)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.22.0' ; fi
445446
if [ $((! GHCJSARITH)) -ne 0 ] ; then doctest --version ; fi
446447
- name: save cache (tools)
447-
uses: actions/cache/save@v4
448448
if: always()
449+
uses: actions/cache/save@v4
449450
with:
450451
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-ac1dc7e1
451452
path: ~/.haskell-ci-tools
@@ -523,8 +524,8 @@ jobs:
523524
rm -f cabal.project.local
524525
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
525526
- name: save cache
526-
uses: actions/cache/save@v4
527527
if: always()
528+
uses: actions/cache/save@v4
528529
with:
529530
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
530531
path: ~/.cabal/store

‎fixtures/empty-line.github‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,13 @@ jobs:
159159
mkdir -p "$HOME/.ghcup/bin"
160160
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162+
- name: Install cabal-install
163+
run: |
164+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
162165
- name: TODO
163166
run: |
164167
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
165168
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
166-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
167169
env:
168170
HCKIND: ${{ matrix.compilerKind }}
169171
HCNAME: ${{ matrix.compiler }}
@@ -346,8 +348,8 @@ jobs:
346348
rm -f cabal.project.local
347349
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
348350
- name: save cache
349-
uses: actions/cache/save@v4
350351
if: always()
352+
uses: actions/cache/save@v4
351353
with:
352354
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
353355
path: ~/.cabal/store

‎fixtures/enabled-jobs.github‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,14 @@ jobs:
322322
mkdir -p "$HOME/.ghcup/bin"
323323
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
324324
chmod a+x "$HOME/.ghcup/bin/ghcup"
325+
- name: Install cabal-install
326+
run: |
327+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
325328
- name: TODO
326329
run: |
327330
if [ "${{ matrix.setup-method }}" = ghcup ]; then
328331
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
329332
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
330-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
331333
else
332334
apt-add-repository -y 'ppa:hvr/ghc'
333335
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'ppa:hvr/ghcjs' ; fi
@@ -336,7 +338,6 @@ jobs:
336338
apt-get update
337339
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-get install -y "$HCNAME" ghc-8.4.4 nodejs ; else apt-get install -y "$HCNAME" ; fi
338340
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
339-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
340341
fi
341342
env:
342343
HCKIND: ${{ matrix.compilerKind }}
@@ -504,8 +505,8 @@ jobs:
504505
rm -f cabal.project.local
505506
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
506507
- name: save cache
507-
uses: actions/cache/save@v4
508508
if: always()
509+
uses: actions/cache/save@v4
509510
with:
510511
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
511512
path: ~/.cabal/store

‎fixtures/fail-versions.github‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,13 @@ jobs:
159159
mkdir -p "$HOME/.ghcup/bin"
160160
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162+
- name: Install cabal-install
163+
run: |
164+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
162165
- name: TODO
163166
run: |
164167
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
165168
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
166-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
167169
env:
168170
HCKIND: ${{ matrix.compilerKind }}
169171
HCNAME: ${{ matrix.compiler }}
@@ -344,8 +346,8 @@ jobs:
344346
rm -f cabal.project.local
345347
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
346348
- name: save cache
347-
uses: actions/cache/save@v4
348349
if: always()
350+
uses: actions/cache/save@v4
349351
with:
350352
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
351353
path: ~/.cabal/store

0 commit comments

Comments
 (0)