aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2024-05-09 12:24:15 -0400
committerJunio C Hamano <gitster@pobox.com>2024-05-09 09:57:32 -0700
commit11c7001e3d37a64a0eacfc314d9609d37f33b9f4 (patch)
treeee4ef499a8e0f09b38dd04c5e2dd06c5b12ecd16
parent9d4453e8d6f304fa1addee1ffe547852866191ac (diff)
downloadgit-11c7001e3d37a64a0eacfc314d9609d37f33b9f4.tar.gz
ci: avoid bare "gcc" for osx-gcc job
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). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.github/workflows/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3428773b09..a2041d5990 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -284,7 +284,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