git: 40903394bf48 - main - GitHub actions: unbreak macOS build
Ulrich Spörlein
uqs at FreeBSD.org
Fri Jan 8 14:37:14 UTC 2021
The branch main has been updated by uqs:
URL: https://cgit.FreeBSD.org/src/commit/?id=40903394bf48c916f0790fac8a2cde5c487a2676
commit 40903394bf48c916f0790fac8a2cde5c487a2676
Author: Ulrich Spörlein <uqs at FreeBSD.org>
AuthorDate: 2021-01-08 14:36:38 +0000
Commit: Ulrich Spörlein <uqs at FreeBSD.org>
CommitDate: 2021-01-08 14:36:38 +0000
GitHub actions: unbreak macOS build
Error: llvm 11.0.0 is already installed
Also make the linking failure non-fatal:
Error: The `brew link` step did not complete successfully
---
.github/workflows/cross-bootstrap-tools.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml
index e8187e4299e9..65db86de3a97 100644
--- a/.github/workflows/cross-bootstrap-tools.yml
+++ b/.github/workflows/cross-bootstrap-tools.yml
@@ -25,8 +25,7 @@ jobs:
pkgs: bmake libarchive-dev
- os: macOS-latest
compiler: clang-11
- #cross-bindir: /usr/local/Cellar/llvm/11.0.0/bin # script figures this out automatically
- pkgs: bmake libarchive llvm at 11
+ pkgs: bmake libarchive
steps:
- uses: actions/checkout at v2
@@ -39,7 +38,7 @@ jobs:
if: runner.os == 'macOS'
run: |
brew update --quiet || true
- brew install ${{ matrix.pkgs }}
+ brew install ${{ matrix.pkgs }} || true
- name: create environment
run: |
echo "GITHUB_WORKSPACE = $GITHUB_WORKSPACE"
More information about the dev-commits-src-main
mailing list