From nobody Wed Feb 22 21:22:48 2023 X-Original-To: dev-commits-src-branches@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 4PMTdj3JNxz3sD8l; Wed, 22 Feb 2023 21:22:49 +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 4PMTdj0lNrz3Ndv; Wed, 22 Feb 2023 21:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677100969; 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=vQ1D2NB0OAvWH5VCg6fejaYz4UdvsYaKlQmuSUO3cWM=; b=j3DAHd5U0CCx/FWx7FBkcc3rTYP+LeLLG9sYy/p+IHsQm8muGIzBbU8WzJGCHWaohbqoji wnzLzexPqaAQ7aS8pRt6zH6hqFfCiPnVU8SL4wjmjZ0NdyNkJyYGD3RW54F8vlk43bMfjl hGcAUlwf7CdvM6y5QnMdRL7S92RDXRJWeJ/nV/OBE1Uosm1UrlDZQds3NhI0TafsYWWGF9 648QHVXse+WFaDJnz3hataPnL+Qy3h+WUv9QHMRqqNo3X/xSAlceE/wXCzV9F0bg/XNUSb 6uxQjyVVmGB9fYIQnbrO+4gZWl1GKhZIIc55YhJhDtFrdgXXoLDSU//OEhJnQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677100969; 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=vQ1D2NB0OAvWH5VCg6fejaYz4UdvsYaKlQmuSUO3cWM=; b=wmChdi2xtvfh/qrgQ+LLDQQhQ/ZaJbNzfH5TFZ6RQ1+RN3vt5QIzLZNfeJKjtN0ur2a0Li pngtQlu2HKkj18q3AshDiPQSV22Ib+XlKugiuWUF/uX4JWDDY70rxRJEKyhSHCbu6XGpjd BEGzpfKNxkJWvS1jJ0U+awl/tVDeuU4qFXvV/fgzS/pMmjZn1HCPUKYEOdNv5Tt29XxmnX PjvMwieB18CH25uSuih4yxMjDZiwwagzRjZIv4GnhwODXGaDis9z3dRxvwDqeB0jc6O781 0NELm2ssGmIMtb6h8i0MxMw9Vl8QddOuNfl/voT1xnf+ngEOSpVHwW8obdJrfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677100969; a=rsa-sha256; cv=none; b=IBMO44P8qZgYZxFJGTiJnexFEBMBWHnkI9Irybi8M9AW13eJ3zF9R1NjUUp9cgkMKeTNfF 8qPvki3GUBUZrLpz1QAy+kSJby9IsjJHhROHkuWUGebmqkQdX8wvPR1J+ssNhtCYpsR1R8 N9hjKelDFDE1Wke3NorAlzt0f6MPDKS/oB9Y24CtjLgPCg15mtmmxlaH6/0zJCxEmOuBLg SeE7JGYaE2saa84pIHxKjKhHgz9f7m376O1cc3k+WUoWS8bdFZOub1Yj/yiVtVuxpRgDLN 154j/dGgy+cVkBCzZIQTvJmv0oN6HVxKmGdPmDEY7EgqLmC8ArZDB0pVEztrHg== 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 4PMTdh6yqtzH8J; Wed, 22 Feb 2023 21:22:48 +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 31MLMmhn014981; Wed, 22 Feb 2023 21:22:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31MLMmRI014980; Wed, 22 Feb 2023 21:22:48 GMT (envelope-from git) Date: Wed, 22 Feb 2023 21:22:48 GMT Message-Id: <202302222122.31MLMmRI014980@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bc68c55166ad - stable/13 - .github: Attempt to fix and increase robustness of macOS action List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bc68c55166ada973141542c9c719f562475cb80c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bc68c55166ada973141542c9c719f562475cb80c commit bc68c55166ada973141542c9c719f562475cb80c Author: Jessica Clarke AuthorDate: 2022-06-30 20:03:26 +0000 Commit: John Baldwin CommitDate: 2023-02-22 20:47:12 +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. (cherry picked from commit 22f731486e80fdbf679712b2a99605ba97a50264) --- .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 c6df31e4fbee..9630470d0420 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -30,8 +30,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