Skip to content

Commit a58d8a2

Browse files
mergify[bot]ulysses4evergeekosaur
committed
CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) (#9956)
* CI: force MacOS jobs to use Intel runners (`macos-13`) GitHub just switched macos-latest to the ARM chips (now alisasing `macos-14`), and it brings a bunch of problems. - First of all, GHC's 8.8 and 8.6 don't exist there. - ghcup and llvm are unavailable For the time being, lets stay on the previous version of the runner. (cherry picked from commit d36e0d0) * CI: GitHub MacOS runners lost ghcup since 2024-04-27, so use haskell-action/setup instead (cherry picked from commit 082d952) * fixup! more compat with new macos runners (cherry picked from commit 326a1f6) * !fixup resolve conflicts * copy an import list from #9551 because `System.Process.Internals` just (like, within the past hour or so) started exporting a name we are using. --------- Co-authored-by: Artem Pelenitsyn <[email protected]> Co-authored-by: brandon s allbery kf8nh <[email protected]>
1 parent b050bdf commit a58d8a2

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

.github/workflows/bootstrap.yml

+6-16
Original file line numberDiff line numberDiff line change
@@ -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: |

cabal-testsuite/PackageTests/Manpage/cabal.test.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ main = cabalTest $ do
77
assertOutputContains ".B cabal install" r
88
assertOutputDoesNotContain ".B cabal manpage" r
99

10-
-- The following test of `cabal man` needs `nroff` which is not available under Windows.
11-
unless (buildOS == Windows) $ do
10+
-- The following test of `cabal man` needs `nroff` which is not available under Windows and OSX.
11+
unless (buildOS == Windows || buildOS ==OSX) $ do
1212

1313
-- Check that output of `cabal man --raw` can be passed through `nroff -man`
1414
-- without producing any warnings (which are printed to stderr).

0 commit comments

Comments
 (0)