From 307a4e25b2a03e6704fcda9ac91289911764b5d1 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 13 Mar 2022 23:23:53 -0700
Subject: [PATCH] CI: use ghcup to install ghc, cabal; use ghc 9.2.2.
---
.github/workflows/ci.yml | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70cad940c..0213f40c2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,8 +63,8 @@ jobs:
prefix: ''
cabalopts: ''
testopts: '--test-option=--hide-successes --test-option=--ansi-tricks=false'
- - ghc: '9.2.1'
- cabal: '3.4'
+ - ghc: '9.2.2'
+ cabal: '3.6'
prefix: ''
cabalopts: ''
testopts: '--test-option=--hide-successes --test-option=--ansi-tricks=false'
@@ -75,13 +75,10 @@ jobs:
- name: Install numa
run: sudo apt-get install libnuma-dev
- # 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