From 741710efa1033e13841139985187a96876bb8a35 Mon Sep 17 00:00:00 2001
From: youben11 <ayoub.benaissa@zama.ai>
Date: Tue, 14 Jun 2022 07:16:13 +0100
Subject: [PATCH] ci: auto rebase llvm if possible

---
 .github/workflows/llvm-compatibility.yml | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/llvm-compatibility.yml b/.github/workflows/llvm-compatibility.yml
index 74b8083de..0645b0d4b 100644
--- a/.github/workflows/llvm-compatibility.yml
+++ b/.github/workflows/llvm-compatibility.yml
@@ -16,11 +16,12 @@ jobs:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
 
-      - name: Update LLVM
-        id: update-llvm
+      - name: Rebase LLVM
         run: |
-          git submodule update --remote
-          echo "::set-output name=commit::$(cd llvm-project && git rev-parse --short HEAD)"
+          cd llvm-project
+          git remote add base git@github.com:llvm/llvm-project.git
+          git fetch base
+          git rebase base/main
 
       - name: Log LLVM commit
         run: echo "LLVM commit" && cd ${{ github.workspace }}/llvm-project && git log -1
@@ -40,6 +41,20 @@ jobs:
             pip install pytest
             make BUILD_DIR=/build test
 
+      - name: Update Custom LLVM
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GH_TOKEN }}
+          branch: main
+          force: true
+          repository: zama-ai/concrete-compiler-internal-llvm-project
+
+      - name: Update LLVM submodule
+        id: update-llvm
+        run: |
+          git submodule update --remote
+          echo "::set-output name=commit::$(cd llvm-project && git rev-parse --short HEAD)"
+
       - name: Commit latest LLVM version
         uses: EndBug/add-and-commit@v7
         with: