|
57 | 57 |
|
58 | 58 | - uses: actions/checkout@v3
|
59 | 59 |
|
60 |
| - # See https://github.com/haskell/cabal/pull/8739 |
61 |
| - - name: Sudo chmod to permit ghcup to update its cache |
62 |
| - run: | |
63 |
| - if [[ "${{ runner.os }}" == "Linux" ]]; then |
64 |
| - sudo ls -lah /usr/local/.ghcup/cache |
65 |
| - sudo mkdir -p /usr/local/.ghcup/cache |
66 |
| - sudo ls -lah /usr/local/.ghcup/cache |
67 |
| - sudo chown -R $USER /usr/local/.ghcup |
68 |
| - sudo chmod -R 777 /usr/local/.ghcup |
69 |
| - fi |
70 |
| - - uses: haskell/actions/setup@v2 |
| 60 | + - uses: haskell-actions/setup@v2 |
71 | 61 | id: setup-haskell
|
72 | 62 | with:
|
73 | 63 | ghc-version: ${{ matrix.ghc }}
|
@@ -356,11 +346,12 @@ jobs:
|
356 | 346 | apt-get update
|
357 | 347 | apt-get install -y ghc-${{ matrix.extra-ghc }}-dyn
|
358 | 348 |
|
359 |
| - - uses: haskell/actions/setup@v2 |
| 349 | + - uses: haskell-actions/setup@v2 |
360 | 350 | id: setup-haskell
|
361 | 351 | with:
|
362 | 352 | ghc-version: ${{ matrix.ghc }}
|
363 |
| - cabal-version: '3.10.1.0' |
| 353 | + # Make sure this bindist works in this old environment |
| 354 | + cabal-version: 3.10.1.0 |
364 | 355 |
|
365 | 356 | # As we are reusing the cached build dir from the previous step
|
366 | 357 | # the generated artifacts are available here,
|
@@ -415,7 +406,7 @@ jobs:
|
415 | 406 | sudo chown -R $USER /usr/local/.ghcup
|
416 | 407 | sudo chmod -R 777 /usr/local/.ghcup
|
417 | 408 | fi
|
418 |
| - - uses: haskell/actions/setup@v2 |
| 409 | + - uses: haskell-actions/setup@v2 |
419 | 410 | id: setup-haskell
|
420 | 411 | with:
|
421 | 412 | ghc-version: ${{ matrix.ghc }}
|
|
0 commit comments