Skip to content

Commit 082d952

Browse files
ulysses4everMikolaj
authored andcommitted
CI: GitHub MacOS runners lost ghcup since 2024-04-27, so use haskell-action/setup instead
1 parent d36e0d0 commit 082d952

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

.github/workflows/bootstrap.yml

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
os: [ubuntu-latest]
3333
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.2"]
3434
include:
35-
- os: macos-13
35+
- os: macos-latest
3636
ghc: "9.2.8"
3737
name: Bootstrap ${{ matrix.os }} ghc-${{ matrix.ghc }}
3838
runs-on: ${{ matrix.os }}
@@ -52,28 +52,18 @@ jobs:
5252
restore-keys: bootstrap-${{ runner.os }}-${{ matrix.ghc }}-20221115-
5353

5454
- 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+
6559
- name: bootstrap.py
6660
run: |
6761
GHC_VERSION=${{ matrix.ghc }}
68-
ghcup --version
69-
ghcup config set cache true
70-
ghcup install ghc $GHC_VERSION
71-
7262
# 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
7464
7565
# 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
7767
7868
- name: Smoke test
7969
run: |

0 commit comments

Comments
 (0)