From 8d045653948d7e522486203507d1edeb356a6fd3 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 24 Mar 2022 09:26:47 -0700
Subject: [PATCH] Replace haskell/actions/setup with ghcup.
ghcup is installed by default on the GitHub runners.
This allows us to avoid relying on a third-party action
and may render #7984 irrelevant.
---
.github/workflows/ci.yml | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0213f40c2..b4bbd89fa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -119,12 +119,6 @@ jobs:
steps:
- uses: actions/checkout@v2
- # We should have ghc 8.10, cabal, stack pre-installed
- # - uses: haskell/actions/setup@v1
- # with:
- # enable-stack: true
- # stack-version: 'latest'
-
# declare/restore cached things
# caching doesn't work for scheduled runs yet
# https://github.com/actions/cache/issues/63
@@ -168,11 +162,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- - name: Install recent cabal/ghc
- uses: haskell/actions/setup@v1
- with:
- ghc-version: ${{ matrix.versions.ghc }}
- cabal-version: ${{ matrix.versions.cabal }}
+ - name: Install cabal/ghc
+ run: |
+ ghcup install ghc --set ${{ matrix.versions.ghc }}
+ ghcup install cabal ${{ matrix.versions.cabal }}
# declare/restore cached things
# caching doesn't work for scheduled runs yet
@@ -219,13 +212,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- # need to install older cabal/ghc versions from ppa repository
-
- - name: Install recent cabal/ghc
- uses: haskell/actions/setup@v1
- with:
- ghc-version: ${{ matrix.versions.ghc }}
- cabal-version: ${{ matrix.versions.cabal }}
+ - name: Install cabal/ghc
+ run: |
+ ghcup install ghc --set ${{ matrix.versions.ghc }}
+ ghcup install cabal ${{ matrix.versions.cabal }}
# declare/restore cached things
# caching doesn't work for scheduled runs yet