From 9e641b01bc13d750245a259a4d1013364b97071b Mon Sep 17 00:00:00 2001 From: Aaron Jomy Date: Sat, 3 Oct 2026 14:05:55 +0200 Subject: [PATCH 1/2] [ci] Add github workflow to check diff against upstream cppjit --- .github/workflows/cppjit-diff.yml | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/cppjit-diff.yml diff --git a/.github/workflows/cppjit-diff.yml b/.github/workflows/cppjit-diff.yml new file mode 100644 index 0000000000000..60cdce08483af --- /dev/null +++ b/.github/workflows/cppjit-diff.yml @@ -0,0 +1,32 @@ +name: Diff cppjit against upstream +on: + pull_request: + paths: + - 'bindings/pyroot/cppjit/**' + +jobs: + cppjit-diff: + runs-on: ubuntu-latest + steps: + - name: Check out ROOT + uses: actions/checkout@v6 + with: + path: root + - name: Determine tag that cppjit in ROOT is based + id: determine-tag + run: | + tag_file=root/bindings/pyroot/cppjit/cppjit-version.tag + echo "tag=$(cat $tag_file)" >> $GITHUB_OUTPUT + rm $tag_file + - name: Check out cppjit + uses: actions/checkout@v6 + with: + repository: compiler-research/cppjit + ref: ${{ steps.determine-tag.outputs.tag }} + path: cppjit + - name: Drop files that are not added to ROOT + working-directory: cppjit + run: | + rm -rf .git .github zizmor.yml + - name: Compare + run: diff -ur cppjit/ root/bindings/pyroot/cppjit/ From c69b7892b48d053dfce0674a9e3cf36236775fd1 Mon Sep 17 00:00:00 2001 From: Aaron Jomy Date: Sat, 3 Oct 2026 14:05:55 +0200 Subject: [PATCH 2/2] [cppjit] Point cppjit-version.tag at the ROOT branch of cppjit The vendored tree carries ROOT patches on top of the upstream pin, so it is mirrored verbatim on the ROOT branch of compiler-research/cppjit. The diff workflow compares against that commit. --- bindings/pyroot/cppjit/cppjit-version.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/pyroot/cppjit/cppjit-version.tag b/bindings/pyroot/cppjit/cppjit-version.tag index 73ba1b109d5a2..7905b105a9b02 100644 --- a/bindings/pyroot/cppjit/cppjit-version.tag +++ b/bindings/pyroot/cppjit/cppjit-version.tag @@ -1 +1 @@ -7dc6bf0ff47b56afe528a1b67dbd2724423e79d9 +e0945224e5b84336d570872ea47989457dae9d8e