From eb179a2751d2d6b16c2fc92250c45e9c15b45710 Mon Sep 17 00:00:00 2001 From: Alexander Richardson Date: Sun, 24 Jan 2021 12:09:07 +0000 Subject: [PATCH 1/3] GitHub Actions: Use oldest Ubuntu and newest macOS This ensures that we can build on macOS 11.0 and the oldest supported Ubuntu release (both of which were previously broken). --- .github/workflows/cross-bootstrap-tools.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index adfc56b72147..b4bd08c01770 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -15,11 +15,11 @@ jobs: matrix: include: # TODO: both Ubuntu and macOS have bmake packages, we should try them instead of bootstrapping our own copy. - - os: ubuntu-20.04 + - os: ubuntu-16.04 compiler: clang-10 cross-bindir: /usr/lib/llvm-10/bin pkgs: bmake libarchive-dev - - os: macOS-latest + - os: macOS-11.0 compiler: clang-11 #cross-bindir: /usr/local/Cellar/llvm/11.0.0/bin # script figures this out automatically pkgs: bmake libarchive llvm@11 From 594c6324a387ec7e8d13d482b4df582509f7fcff Mon Sep 17 00:00:00 2001 From: Alexander Richardson Date: Sun, 24 Jan 2021 12:12:38 +0000 Subject: [PATCH 2/3] Update cross-bootstrap-tools.yml --- .github/workflows/cross-bootstrap-tools.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index b4bd08c01770..d323e17dad66 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -16,8 +16,8 @@ jobs: include: # TODO: both Ubuntu and macOS have bmake packages, we should try them instead of bootstrapping our own copy. - os: ubuntu-16.04 - compiler: clang-10 - cross-bindir: /usr/lib/llvm-10/bin + compiler: clang-9 + cross-bindir: /usr/lib/llvm-9/bin pkgs: bmake libarchive-dev - os: macOS-11.0 compiler: clang-11 From 218baa49c8711c5eb918a86ef5527bf1bdbcb1fd Mon Sep 17 00:00:00 2001 From: Alexander Richardson Date: Sun, 24 Jan 2021 13:52:01 +0000 Subject: [PATCH 3/3] Update cross-bootstrap-tools.yml --- .github/workflows/cross-bootstrap-tools.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index d323e17dad66..d8b03762a629 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -19,7 +19,7 @@ jobs: compiler: clang-9 cross-bindir: /usr/lib/llvm-9/bin pkgs: bmake libarchive-dev - - os: macOS-11.0 + - os: macos-11.0 compiler: clang-11 #cross-bindir: /usr/local/Cellar/llvm/11.0.0/bin # script figures this out automatically pkgs: bmake libarchive llvm@11