git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>
Subject: [PATCH v2 04/12] ci: avoid bare "gcc" for osx-gcc job
Date: Fri, 24 May 2024 12:47:07 -0700	[thread overview]
Message-ID: <20240524194715.695916-5-gitster@pobox.com> (raw)
In-Reply-To: <20240524194715.695916-1-gitster@pobox.com>

From: Jeff King <peff@peff.net>

On macOS, a bare "gcc" (without a version) will invoke a wrapper for
clang, not actual gcc. Even when gcc is installed via homebrew, that
only provides version-specific links in /usr/local/bin (like "gcc-13"),
and never a version-agnostic "gcc" wrapper.

As far as I can tell, this has been the case for a long time, and this
osx-gcc job has largely been doing nothing. We can point it at "gcc-13",
which will pick up the homebrew-installed version.

The fix here is specific to the github workflow file, as the gitlab one
does not have a matching job.

It's a little unfortunate that we cannot just ask for the latest version
of gcc which homebrew provides, but as far as I can tell there is no
easy alias (you'd have to find the highest number gcc-* in
/usr/local/bin yourself).

[jc: cherry-picked from v2.45.0-2-g11c7001e3d]

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2dc0221f7f..583e7cd5f0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -264,7 +264,7 @@ jobs:
             cc: clang
             pool: macos-13
           - jobname: osx-gcc
-            cc: gcc
+            cc: gcc-13
             cc_package: gcc-13
             pool: macos-13
           - jobname: linux-gcc-default
-- 
2.45.1-246-gb9cfe4845c


  parent reply	other threads:[~2024-05-24 19:47 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-24 19:47 [PATCH v2 00/12] Fix various overly aggressive protections in 2.45.1 and friends Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 01/12] send-email: drop FakeTerm hack Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 02/12] send-email: avoid creating more than one Term::ReadLine object Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 03/12] ci: drop mention of BREW_INSTALL_PACKAGES variable Junio C Hamano
2024-05-24 19:47 ` Junio C Hamano [this message]
2024-05-24 19:47 ` [PATCH v2 05/12] ci: stop installing "gcc-13" for osx-gcc Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 06/12] hook: plug a new memory leak Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 07/12] init: use the correct path of the templates directory again Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 08/12] Revert "core.hooksPath: add some protection while cloning" Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 09/12] tests: verify that `clone -c core.hooksPath=/dev/null` works again Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 10/12] clone: drop the protections where hooks aren't run Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 11/12] Revert "Add a helper function to compare file contents" Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 12/12] Revert "fsck: warn about symlink pointing inside a gitdir" Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240524194715.695916-5-gitster@pobox.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).