From 05c868c2e4f093f820e08107328d7813ed35c8f4 Mon Sep 17 00:00:00 2001 From: Lukas Johannes Breitwieser Date: Mon, 7 Sep 2026 13:25:55 +0200 Subject: [PATCH 1/4] Debug failing macos builds --- .github/workflows/root-ci.yml | 13 +++++++++++++ interpreter/cling/tools/plugins/clad/CMakeLists.txt | 1 + 2 files changed, 14 insertions(+) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index e6400a2d19e62..284d2ae21ab22 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -148,6 +148,19 @@ jobs: ref: ${{ inputs.ref_name }} path: "src/" + - name: Clone clad + env: + GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }} + OVERRIDES: ${{ join( matrix.overrides, ' ') }} + run: | + set -x + env | grep -i GIT_CONFIG + git config --global --get-regexp 'http\..*extraheader' + git config --system --get-regexp 'http\..*extraheader' + git ls-remote https://github.com/vgvassilev/clad.git + cd /tmp + git clone https://github.com/vgvassilev/clad.git + - uses: root-project/gcc-problem-matcher-improved@main with: build-directory: /Users/sftnight/ROOT-CI/src/ diff --git a/interpreter/cling/tools/plugins/clad/CMakeLists.txt b/interpreter/cling/tools/plugins/clad/CMakeLists.txt index ab93259e12fa1..2bda528bb0656 100644 --- a/interpreter/cling/tools/plugins/clad/CMakeLists.txt +++ b/interpreter/cling/tools/plugins/clad/CMakeLists.txt @@ -101,6 +101,7 @@ ExternalProject_Add( BUILD_COMMAND ${CMAKE_COMMAND} --build . ${EXTRA_BUILD_ARGS} INSTALL_COMMAND ${CMAKE_COMMAND} --build . ${EXTRA_BUILD_ARGS} --target install BUILD_BYPRODUCTS ${CLAD_BYPRODUCTS} + GIT_CONFIG "credential.helper=" "http.https://github.com/.extraheader=" ${_clad_extra_settings} # We need the target clangBasic to be built before building clad. However, we # support building prebuilt clang and adding clangBasic breaks this case. From 80bffc74dd9c0ae3b77c0152df033007bd787924 Mon Sep 17 00:00:00 2001 From: Lukas Johannes Breitwieser Date: Mon, 7 Sep 2026 13:38:19 +0200 Subject: [PATCH 2/4] WIP --- .github/workflows/root-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 284d2ae21ab22..8fd2d65e142ed 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -154,9 +154,8 @@ jobs: OVERRIDES: ${{ join( matrix.overrides, ' ') }} run: | set -x - env | grep -i GIT_CONFIG - git config --global --get-regexp 'http\..*extraheader' - git config --system --get-regexp 'http\..*extraheader' + git config --global --get-regexp 'http\..*extraheader' || true + git config --system --get-regexp 'http\..*extraheader' || true git ls-remote https://github.com/vgvassilev/clad.git cd /tmp git clone https://github.com/vgvassilev/clad.git From 5ca5a26aeb5f3ec38485d307a50dce3175dcc812 Mon Sep 17 00:00:00 2001 From: Lukas Johannes Breitwieser Date: Mon, 7 Sep 2026 13:56:25 +0200 Subject: [PATCH 3/4] Gather more information --- .github/workflows/root-ci.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 8fd2d65e142ed..9d05c87e7dd20 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -154,10 +154,17 @@ jobs: OVERRIDES: ${{ join( matrix.overrides, ' ') }} run: | set -x + cd /tmp git config --global --get-regexp 'http\..*extraheader' || true git config --system --get-regexp 'http\..*extraheader' || true - git ls-remote https://github.com/vgvassilev/clad.git - cd /tmp + git config --global --get-regexp credential || true + git config --system --get-regexp credential || true + # git ls-remote https://github.com/vgvassilev/clad.git + curl -vI https://github.com 2>&1 | grep -E "issuer|subject|HTTP/" || true + # trace + GIT_CURL_VERBOSE=1 GIT_TRACE=1 git clone https://github.com/vgvassilev/clad.git /tmp/clad-trace 2>&1 | head -300 || true + # try clean env variables + env -i PATH="$PATH" HOME="$HOME" git clone https://github.com/vgvassilev/clad.git /tmp/clad-clean || true git clone https://github.com/vgvassilev/clad.git - uses: root-project/gcc-problem-matcher-improved@main From 00db789cbf93ceea1adf3168c8d05229772e4811 Mon Sep 17 00:00:00 2001 From: Lukas Johannes Breitwieser Date: Mon, 7 Sep 2026 14:49:37 +0200 Subject: [PATCH 4/4] Attempt to use GITHUB_TOKEN to download foreign github repos --- .github/workflows/root-ci.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 9d05c87e7dd20..879596466daeb 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -153,18 +153,20 @@ jobs: GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }} OVERRIDES: ${{ join( matrix.overrides, ' ') }} run: | - set -x + # set -x cd /tmp - git config --global --get-regexp 'http\..*extraheader' || true - git config --system --get-regexp 'http\..*extraheader' || true - git config --global --get-regexp credential || true - git config --system --get-regexp credential || true - # git ls-remote https://github.com/vgvassilev/clad.git - curl -vI https://github.com 2>&1 | grep -E "issuer|subject|HTTP/" || true - # trace - GIT_CURL_VERBOSE=1 GIT_TRACE=1 git clone https://github.com/vgvassilev/clad.git /tmp/clad-trace 2>&1 | head -300 || true - # try clean env variables - env -i PATH="$PATH" HOME="$HOME" git clone https://github.com/vgvassilev/clad.git /tmp/clad-clean || true + # git config --global --get-regexp 'http\..*extraheader' || true + # git config --system --get-regexp 'http\..*extraheader' || true + # git config --global --get-regexp credential || true + # git config --system --get-regexp credential || true + # # git ls-remote https://github.com/vgvassilev/clad.git + # curl -vI https://github.com 2>&1 | grep -E "issuer|subject|HTTP/" || true + # # trace + # GIT_CURL_VERBOSE=1 GIT_TRACE=1 git clone https://github.com/vgvassilev/clad.git /tmp/clad-trace 2>&1 | head -300 || true + # # try clean env variables + # env -i PATH="$PATH" HOME="$HOME" git clone https://github.com/vgvassilev/clad.git /tmp/clad-clean || true + git config --global url."https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/".insteadOf "https://github.com/" || true + echo "clone" git clone https://github.com/vgvassilev/clad.git - uses: root-project/gcc-problem-matcher-improved@main