Touch up CI, broken by github installing 9.2.1

haskell · Nov 4, 2021 · 475222d · 475222d
1 parent 65a51c8
commit 475222d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
@@ -22,6 +22,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: bootstrap.py
         run: |
+          ghcup config set cache true
           ghcup install ghc 8.10.7
           python3 bootstrap/bootstrap.py -w $(ghcup whereis ghc 8.10.7) -d bootstrap/linux-8.10.7.json
 
@@ -43,6 +44,7 @@ jobs:
       # We use linux dependencies
       - name: bootstrap.py
         run: |
+          ghcup config set cache true
           ghcup install ghc 8.10.7
           python3 bootstrap/bootstrap.py -w $(ghcup whereis ghc 8.10.7) -d bootstrap/linux-8.10.7.json
 

diff --git a/.github/workflows/quick-jobs.yml b/.github/workflows/quick-jobs.yml
@@ -28,6 +28,11 @@ jobs:
         with:
           path: ~/.cabal/store
           key: linux-store-meta
+      - name: ghcup
+        run: |
+          ghcup config set cache true
+          ghcup install ghc recommended
+          ghcup set ghc recommended
       - name: Update Hackage index
         run: cabal v2-update
       - name: Install alex
@@ -62,6 +67,11 @@ jobs:
         with:
           path: ~/.cabal/store
           key: linux-store-doctest
+      - name: ghcup
+        run: |
+          ghcup config set cache true
+          ghcup install ghc recommended
+          ghcup set ghc recommended
       - name: Update Hackage index
         run: cabal v2-update
       - name: Install doctest

diff --git a/templates/ci-bootstrap.template.yml b/templates/ci-bootstrap.template.yml
@@ -22,6 +22,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: bootstrap.py
         run: |
+          ghcup config set cache true
           ghcup install ghc 8.10.7
           python3 bootstrap/bootstrap.py -w $(ghcup whereis ghc 8.10.7) -d bootstrap/linux-8.10.7.json
 
@@ -43,6 +44,7 @@ jobs:
       # We use linux dependencies
       - name: bootstrap.py
         run: |
+          ghcup config set cache true
           ghcup install ghc 8.10.7
           python3 bootstrap/bootstrap.py -w $(ghcup whereis ghc 8.10.7) -d bootstrap/linux-8.10.7.json
 

diff --git a/templates/ci-quick-jobs.template.yml b/templates/ci-quick-jobs.template.yml
@@ -28,6 +28,11 @@ jobs:
         with:
           path: ~/.cabal/store
           key: linux-store-meta
+      - name: ghcup
+        run: |
+          ghcup config set cache true
+          ghcup install ghc recommended
+          ghcup set ghc recommended
       - name: Update Hackage index
         run: cabal v2-update
       - name: Install alex
@@ -62,6 +67,11 @@ jobs:
         with:
           path: ~/.cabal/store
           key: linux-store-doctest
+      - name: ghcup
+        run: |
+          ghcup config set cache true
+          ghcup install ghc recommended
+          ghcup set ghc recommended
       - name: Update Hackage index
         run: cabal v2-update
       - name: Install doctest