From: Josh Steadmon <steadmon@google.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net
Subject: [PATCH v2 1/2] ci: also define CXX environment variable
Date: Thu, 11 Apr 2024 11:14:24 -0700 [thread overview]
Message-ID: <e55b6912725fa478134c7a67a9e4aeab7dca2c57.1712858920.git.steadmon@google.com> (raw)
In-Reply-To: <cover.1712858920.git.steadmon@google.com>
In a future commit, we will build the fuzzer executables as part of the
default 'make all' target, which requires a C++ compiler. If we do not
explicitly set CXX, it defaults to g++ on GitHub CI. However, this can
lead to incorrect feature detection when CC=clang, since the
'detect-compiler' script only looks at CC. Fix the issue by always
setting CXX to match CC in our CI config.
We only plan on building fuzzers on Linux with the next patch, so for
now, only adjust configuration for the Linux CI jobs.
Signed-off-by: Josh Steadmon <steadmon@google.com>
---
.github/workflows/main.yml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3428773b09..d9986256e6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -265,42 +265,54 @@ jobs:
vector:
- jobname: linux-sha256
cc: clang
+ cxx: clang++
pool: ubuntu-latest
- jobname: linux-reftable
cc: clang
+ cxx: clang++
pool: ubuntu-latest
- jobname: linux-gcc
cc: gcc
+ cxx: g++
cc_package: gcc-8
pool: ubuntu-20.04
- jobname: linux-TEST-vars
cc: gcc
+ cxx: g++
cc_package: gcc-8
pool: ubuntu-20.04
- jobname: osx-clang
cc: clang
+ cxx: clang++
pool: macos-13
- jobname: osx-reftable
cc: clang
+ cxx: clang++
pool: macos-13
- jobname: osx-gcc
cc: gcc
+ cxx: g++
cc_package: gcc-13
pool: macos-13
- jobname: linux-gcc-default
cc: gcc
+ cxx: g++
pool: ubuntu-latest
- jobname: linux-leaks
cc: gcc
+ cxx: g++
pool: ubuntu-latest
- jobname: linux-reftable-leaks
cc: gcc
+ cxx: g++
pool: ubuntu-latest
- jobname: linux-asan-ubsan
cc: clang
+ cxx: clang++
pool: ubuntu-latest
env:
CC: ${{matrix.vector.cc}}
+ CXX: ${{matrix.vector.cxx}}
CC_PACKAGE: ${{matrix.vector.cc_package}}
jobname: ${{matrix.vector.jobname}}
runs_on_pool: ${{matrix.vector.pool}}
--
2.44.0.683.g7961c838ac-goog
next prev parent reply other threads:[~2024-04-11 18:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 21:11 [PATCH 0/2] fuzz: build fuzzers by default on Linux Josh Steadmon
2024-03-05 21:11 ` [PATCH 1/2] ci: also define CXX environment variable Josh Steadmon
2024-03-05 21:37 ` Junio C Hamano
2024-04-09 21:32 ` Josh Steadmon
2024-03-06 0:50 ` Jeff King
2024-03-06 1:00 ` Jeff King
2024-04-10 20:58 ` Josh Steadmon
2024-03-05 21:12 ` [PATCH 2/2] fuzz: link fuzz programs with `make all` on Linux Josh Steadmon
2024-03-05 21:44 ` Junio C Hamano
2024-04-09 21:58 ` Josh Steadmon
2024-04-10 20:49 ` Josh Steadmon
2024-04-10 20:57 ` Junio C Hamano
2024-04-10 21:11 ` Jeff King
2024-03-26 21:51 ` [PATCH 0/2] fuzz: build fuzzers by default " Junio C Hamano
2024-04-09 21:34 ` Josh Steadmon
2024-04-11 18:14 ` [PATCH v2 " Josh Steadmon
2024-04-11 18:14 ` Josh Steadmon [this message]
2024-04-12 4:22 ` [PATCH v2 1/2] ci: also define CXX environment variable Jeff King
2024-04-24 18:15 ` Josh Steadmon
2024-04-11 18:14 ` [PATCH v2 2/2] fuzz: link fuzz programs with `make all` on Linux Josh Steadmon
2024-04-11 21:39 ` Junio C Hamano
2024-04-24 18:14 ` [PATCH v3] " Josh Steadmon
2024-04-24 19:07 ` 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=e55b6912725fa478134c7a67a9e4aeab7dca2c57.1712858920.git.steadmon@google.com \
--to=steadmon@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.