From nobody Thu Jun 30 20:05:08 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 929548A77EC; Thu, 30 Jun 2022 20:05:08 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LYq7S3fqzz4p74; Thu, 30 Jun 2022 20:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656619508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XUDnHcKeXVdFi8xWoM4I91io03OkLuVc/gSRxX7LEIM=; b=WBwKiYY+R9gswqD7sFmOQLeRk5PCI2E8rMTxXgEykYAhbsWQx9QAskNSQCTgaTpZB4N0qo 17BfOjvxm6g0HsjOIJqdCxuadWTI/DTcGua/29XvTkBlg47QwsgXzazsV9h+Bp1Mgp4PCt bxJIo2Cn8cDLTFBGINPlnCINMEI7CKv1GB0B+LUMrb24q8Et+ixYiuNvYwzNmW/hGiqDar ynr1xRtASM3RJTXWnzh0yxL57lvOqgYNHRCiOSfItPY4LrVCqeOpM/UmubX/YltbMiggCq 9C5UjHw6uA48ZkWzFphWruuHK4WzPMdiE8aWuLYOra/S0mjKGsGZQY79joiXgA== 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 5D0A5540E; Thu, 30 Jun 2022 20:05:08 +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 25UK58TV028375; Thu, 30 Jun 2022 20:05:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25UK588c028374; Thu, 30 Jun 2022 20:05:08 GMT (envelope-from git) Date: Thu, 30 Jun 2022 20:05:08 GMT Message-Id: <202206302005.25UK588c028374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 22f731486e80 - main - .github: Attempt to fix and increase robustness of macOS action List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22f731486e80fdbf679712b2a99605ba97a50264 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656619508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XUDnHcKeXVdFi8xWoM4I91io03OkLuVc/gSRxX7LEIM=; b=jojISMgUYVHL+1ZDu/smKDKmaVT/C5QSFSwkLBEMngjZKUo1KSaIPNYivxTfK4T5F4cTfR MV+sdBqYgjPcClnP8FYVsuPQdrcqS35gKe8D8qv09S6GzLfq1Vxff24/usVAuuoF/Mvy/d 7+dEWTchVpIKrlG4TBu8PNly1oLd8qHOnKvKTrdXcfTBYKAOWuqy3yWYz45JFZGgv4GbX+ sUa9T3Hz/iHaw0AcK1Vl8tTvlcPNsKFjHPC3t7ihcvTEVxo0rhen97m02aIVhR8e8F5zeg jEWJBfjYv+e2G+/u785izSAtlLaSWuIOu1D30ydYk9v2WLA2UaWB86aw8a+wYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656619508; a=rsa-sha256; cv=none; b=raV4Bgzsgdn7chaa704t/SVjURcPUNMXpdgnYkNxOoTDwuC0LTF7gE3MwsCs1L4wz5hqIF hJpj27Pn3Wklzt2lChHhcebZicsDcCC5BZJQ9jNDc/8/gjWASWWtklYYTbi8eRWrr3SNkX jj1NUsP2egOKrESswdOu08WRoHobCirE9OQ6YJTzp5ncY+sNGv2yBGAv7liVOUSUbYCDSJ ptvGd6ITCvdtfLanacNM0QgNl30vIEm953ZAw83ZM4kYCs3G7dCE1kE+RKQQshdtauyaaP KPRv/gs1GWR9NNvxEJ/ayKRp5aYTyy3V3KxBWNpRApGjosdSZKfCbu3lcZUlHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=22f731486e80fdbf679712b2a99605ba97a50264 commit 22f731486e80fdbf679712b2a99605ba97a50264 Author: Jessica Clarke AuthorDate: 2022-06-30 20:03:26 +0000 Commit: Jessica Clarke CommitDate: 2022-06-30 20:03:26 +0000 .github: Attempt to fix and increase robustness of macOS action Homebrew has added LLVM 14 and made that the default version, but GitHub continues to install LLVM 13 for now, so it ends up only accessible via the versioned name and not the unversioned one. We also add an explicit installation of llvm@13 so that, if GitHub updates the image to using LLVM 14, the action continues to work, albeit slightly more slowly. This also ensures the compiler label remains correct rather than outdated, as has occurred in the past, and that we don't get new versions of LLVM before we're ready for them, which is especially relevant for stable branches. This all mirrors how the Ubuntu jobs are configured. --- .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 2d981b3fdff2..ce50bc9cb36e 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -27,8 +27,8 @@ jobs: pkgs: bmake libarchive-dev clang-14 lld-14 - os: macos-latest compiler: clang-13 - cross-bindir: /usr/local/opt/llvm/bin - pkgs: bmake libarchive + cross-bindir: /usr/local/opt/llvm@13/bin + pkgs: bmake libarchive llvm@13 - target_arch: amd64 target: amd64 - target_arch: aarch64