32
32
os : [ubuntu-latest]
33
33
ghc : ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.2"]
34
34
include :
35
- - os : macos-13
35
+ - os : macos-latest
36
36
ghc : " 9.2.8"
37
37
name : Bootstrap ${{ matrix.os }} ghc-${{ matrix.ghc }}
38
38
runs-on : ${{ matrix.os }}
@@ -52,28 +52,18 @@ jobs:
52
52
restore-keys : bootstrap-${{ runner.os }}-${{ matrix.ghc }}-20221115-
53
53
54
54
- uses : actions/checkout@v4
55
- # See https://github.com/haskell/cabal/pull/8739
56
- - name : Sudo chmod to permit ghcup to update its cache
57
- run : |
58
- if [[ "${{ runner.os }}" == "Linux" ]]; then
59
- sudo ls -lah /usr/local/.ghcup/cache
60
- sudo mkdir -p /usr/local/.ghcup/cache
61
- sudo ls -lah /usr/local/.ghcup/cache
62
- sudo chown -R $USER /usr/local/.ghcup
63
- sudo chmod -R 777 /usr/local/.ghcup
64
- fi
55
+ - uses : haskell-actions/setup@v2
56
+ with :
57
+ ghc-version : ${{ matrix.ghc }}
58
+
65
59
- name : bootstrap.py
66
60
run : |
67
61
GHC_VERSION=${{ matrix.ghc }}
68
- ghcup --version
69
- ghcup config set cache true
70
- ghcup install ghc $GHC_VERSION
71
-
72
62
# Fetch the bootstrap sources (we use linux dependencies also on macos)
73
- python3 bootstrap/bootstrap.py -w $(ghcup whereis ghc $GHC_VERSION) - d bootstrap/linux-$GHC_VERSION.json fetch
63
+ python3 bootstrap/bootstrap.py -d bootstrap/linux-$GHC_VERSION.json fetch
74
64
75
65
# Bootstrap using the bootstrap sources
76
- python3 bootstrap/bootstrap.py -w $(ghcup whereis ghc $GHC_VERSION) - -bootstrap-sources bootstrap-sources.tar.gz
66
+ python3 bootstrap/bootstrap.py --bootstrap-sources bootstrap-sources.tar.gz
77
67
78
68
- name : Smoke test
79
69
run : |
0 commit comments