From owner-dev-commits-src-main@freebsd.org Fri Jan 8 14:37:14 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5977A4CBDDD;
Fri, 8 Jan 2021 14:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4DC5KQ23r0z4SY3;
Fri, 8 Jan 2021 14:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 399B024EB5;
Fri, 8 Jan 2021 14:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 108EbEhl047318;
Fri, 8 Jan 2021 14:37:14 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 108EbEfN047317;
Fri, 8 Jan 2021 14:37:14 GMT (envelope-from git)
Date: Fri, 8 Jan 2021 14:37:14 GMT
Message-Id: <202101081437.108EbEfN047317@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ulrich Spörlein <uqs@FreeBSD.org>
Subject: git: 40903394bf48 - main - GitHub actions: unbreak macOS build
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: uqs
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 40903394bf48c916f0790fac8a2cde5c487a2676
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jan 2021 14:37:14 -0000
The branch main has been updated by uqs:
URL: https://cgit.FreeBSD.org/src/commit/?id=40903394bf48c916f0790fac8a2cde5c487a2676
commit 40903394bf48c916f0790fac8a2cde5c487a2676
Author: Ulrich Spörlein <uqs@FreeBSD.org>
AuthorDate: 2021-01-08 14:36:38 +0000
Commit: Ulrich Spörlein <uqs@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@11
+ pkgs: bmake libarchive
steps:
- uses: actions/checkout@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"