Merge pull request #7853 from Mikolaj/3.6

Backport: Add ghcup install call to boostrap script to be future safe
haskell · Dec 4, 2021 · a043454 · a043454
2 parents 763d0cc + 0910ef3
commit a043454
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 5 deletions.
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
@@ -22,6 +22,8 @@ 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
 
       - name: Smoke test
@@ -50,7 +52,9 @@ jobs:
       # We use linux dependencies
       - name: bootstrap.py
         run: |
-          python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.7/bin/ghc -d bootstrap/linux-8.10.7.json
+          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
 
       - name: Smoke test
         run: |

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
@@ -63,6 +68,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/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -68,7 +68,7 @@ jobs:
           cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-tests
         # Using only one job, -j1, to fail less.
-        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.6.0.0\x\cabal\build\cabal\cabal.exe
+        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.6.2.0\x\cabal\build\cabal\cabal.exe
 
   test-windows-8_6_5-dogfood:
     name: test ghc-8.6.5 dogfood
@@ -165,7 +165,7 @@ jobs:
           cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-tests
         # Using only one job, -j1, to fail less.
-        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.10.4\cabal-install-3.6.0.0\x\cabal\build\cabal\cabal.exe
+        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.10.4\cabal-install-3.6.2.0\x\cabal\build\cabal\cabal.exe
 
   test-windows-8_10_4-dogfood:
     name: test ghc-8.10.4 dogfood

diff --git a/templates/ci-bootstrap.template.yml b/templates/ci-bootstrap.template.yml
@@ -22,6 +22,8 @@ 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
 
       - name: Smoke test
@@ -50,7 +52,9 @@ jobs:
       # We use linux dependencies
       - name: bootstrap.py
         run: |
-          python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.7/bin/ghc -d bootstrap/linux-8.10.7.json
+          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
 
       - name: Smoke test
         run: |

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
@@ -63,6 +68,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-windows.template.yml b/templates/ci-windows.template.yml
@@ -75,7 +75,7 @@ jobs:
           cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-tests
         # Using only one job, -j1, to fail less.
-        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-{{ job.version }}\cabal-install-3.6.0.0\x\cabal\build\cabal\cabal.exe
+        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-{{ job.version }}\cabal-install-3.6.2.0\x\cabal\build\cabal\cabal.exe
 
   test-windows-{{ mangleVersion job.version }}-dogfood:
     name: test ghc-{{job.version}} dogfood