From 45443c81b3d889a11dfbfecb6adcc72223f97d7a Mon Sep 17 00:00:00 2001
From: Mikolaj Konarski <mikolaj@well-typed.com>
Date: Fri, 17 Sep 2021 21:13:43 +0200
Subject: [PATCH] Update also Macos boostrap CI to the ghcup format GHA now
uses
on @hasufell 's advice.
---
.github/workflows/bootstrap.yml | 10 +---------
templates/ci-bootstrap.template.yml | 10 +---------
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index d14065a08a..2b4e41f0cc 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -37,20 +37,12 @@ jobs:
name: Bootstrap on macOS
runs-on: macos-latest
steps:
- - name: Install GHC
- run: |
- cd $(mktemp -d)
- curl -sLO "https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-apple-darwin.tar.xz"
- tar -xJf ghc-*.tar.xz
- cd ghc-*
- ./configure --prefix=/opt/ghc/8.10.7
- sudo make install
- uses: actions/checkout@v2
# 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
+ 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-bootstrap.template.yml b/templates/ci-bootstrap.template.yml
index d14065a08a..2b4e41f0cc 100644
--- a/templates/ci-bootstrap.template.yml
+++ b/templates/ci-bootstrap.template.yml
@@ -37,20 +37,12 @@ jobs:
name: Bootstrap on macOS
runs-on: macos-latest
steps:
- - name: Install GHC
- run: |
- cd $(mktemp -d)
- curl -sLO "https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-apple-darwin.tar.xz"
- tar -xJf ghc-*.tar.xz
- cd ghc-*
- ./configure --prefix=/opt/ghc/8.10.7
- sudo make install
- uses: actions/checkout@v2
# 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
+ python3 bootstrap/bootstrap.py -w $(ghcup whereis ghc 8.10.7) -d bootstrap/linux-8.10.7.json
- name: Smoke test
run: |
--
GitLab