From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Carlo Arenas" <carenas@gmail.com>,
"Phillip Wood" <phillip.wood@talktalk.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2] CI: select CC based on CC_PACKAGE (again)
Date: Thu, 21 Apr 2022 19:48:28 +0200 [thread overview]
Message-ID: <patch-v2-1.1-92acf9420a9-20220421T174733Z-avarab@gmail.com> (raw)
In-Reply-To: <patch-1.1-d89ad4d5b7c-20220421T130310Z-avarab@gmail.com>
Fix a regression in 707d2f2fe86 (CI: use "$runs_on_pool", not
"$jobname" to select packages & config, 2021-11-23).
In that commit I changed CC=gcc from CC=gcc-9, but on OSX the "gcc" in
$PATH points to clang, we need to use gcc-9 instead. Likewise for the
linux-gcc job CC=gcc-8 was changed to the implicit CC=gcc, which would
select GCC 9.4.0 instead of GCC 8.4.0.
Furthermore in 25715419bf4 (CI: don't run "make test" twice in one
job, 2021-11-23) when the "linux-TEST-vars" job was split off from
"linux-gcc" the "cc_package: gcc-8" line was copied along with
it.
That wasn't a bug per-se, as that "make test" would have run under GCC
8 before the split into two jobs, but the point of selecting different
compiler for these jobs is to get better coverage, and to narrow down
any issues with a given compiler to the job that runs it. Since the
"linux-TEST-vars" job is already special in other ways (in running
with various GIT_TEST_* variables), and we've got the "linux-gcc" job
covering gcc-8 let's have it used the default system compiler instead.
Reported-by: Carlo Arenas <carenas@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
On Thu, Apr 21 2022, Phillip Wood wrote:
> CC is set in .github/workflows/main.yaml for the ubuntu and macos jobs
> so I think they will not fallback to using CC_PACKAGE and therefore
> not pick up the correct compiler.
Urgh, sorry. I don't know how I got that turned around, but this
version works, and the (currently ongoing) CI run shows that the
linux-gcc job selects gcc-8 correctly, instead of gcc:
https://github.com/avar/git/runs/6116735686?check_suite_focus=true#step:3:22
The osx-gcc job will be likewise fixed, but it's failing in that run
due to the unrelated perforce installation issue affecting all OSX
jobs (fix here:
https://lore.kernel.org/git/cover-0.2-00000000000-20220421T124225Z-avarab@gmail.com/).
Range-diff against v1:
1: d89ad4d5b7c ! 1: 92acf9420a9 CI: select CC based on CC_PACKAGE (again)
@@ ci/lib.sh: then
CI_REPO_SLUG="$GITHUB_REPOSITORY"
CI_JOB_ID="$GITHUB_RUN_ID"
- CC="${CC:-gcc}"
-+ CC="${CC:-${CC_PACKAGE:-gcc}}"
++ CC="${CC_PACKAGE:-${CC:-gcc}}"
DONT_SKIP_TAGS=t
cache_dir="$HOME/none"
.github/workflows/main.yml | 1 -
ci/lib.sh | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c35200defb9..f12819a00d7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -236,7 +236,6 @@ jobs:
- jobname: linux-TEST-vars
cc: gcc
os: ubuntu
- cc_package: gcc-8
pool: ubuntu-latest
- jobname: osx-clang
cc: clang
diff --git a/ci/lib.sh b/ci/lib.sh
index cbc2f8f1caa..86e37da9bc5 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -122,7 +122,7 @@ then
test macos != "$CI_OS_NAME" || CI_OS_NAME=osx
CI_REPO_SLUG="$GITHUB_REPOSITORY"
CI_JOB_ID="$GITHUB_RUN_ID"
- CC="${CC:-gcc}"
+ CC="${CC_PACKAGE:-${CC:-gcc}}"
DONT_SKIP_TAGS=t
cache_dir="$HOME/none"
--
2.36.0.879.g3659959fcca
next prev parent reply other threads:[~2022-04-21 17:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-21 13:03 [PATCH] CI: select CC based on CC_PACKAGE (again) Ævar Arnfjörð Bjarmason
2022-04-21 16:26 ` Phillip Wood
2022-04-21 17:48 ` Ævar Arnfjörð Bjarmason [this message]
2022-04-21 19:05 ` [PATCH v2] " Carlo Arenas
2022-04-21 19:11 ` Junio C Hamano
2022-04-21 19:22 ` Carlo Arenas
2022-04-21 19:47 ` Junio C Hamano
2022-04-21 19:08 ` Junio C Hamano
2022-04-21 19:13 ` Ævar Arnfjörð Bjarmason
2022-04-21 19:51 ` Junio C Hamano
2022-04-21 19:52 ` Ævar Arnfjörð Bjarmason
2022-04-21 19:55 ` Junio C Hamano
2022-04-22 9:20 ` [PATCH v3] " Ævar Arnfjörð Bjarmason
2022-04-22 9:25 ` Phillip Wood
2022-04-22 11:43 ` Ævar Arnfjörð Bjarmason
2022-04-22 18:27 ` Junio C Hamano
2022-04-22 22:40 ` Junio C Hamano
2022-04-22 22:46 ` Ævar Arnfjörð Bjarmason
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=patch-v2-1.1-92acf9420a9-20220421T174733Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@talktalk.net \
--cc=sunshine@sunshineco.com \
/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).