From e0d2c3956568819dcb484141b7c4134a6425d47b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 1 Jun 2023 15:45:27 +0930 Subject: [PATCH] CI: use rebasing instead of merge. This reflects what we actually do when we apply the commit, and also means we can easily iterate the commits. Signed-off-by: Rusty Russell --- .github/workflows/ci.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7e55242ce..5278da202 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -30,6 +30,16 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} + fetch-depth: 0 + + - name: Rebase + run: | + git config user.name github-actions + git config user.email github-actions@github.com + git fetch origin ${{ github.base_ref }} + git rebase origin/${{ github.base_ref }} - name: Set up Python 3.7 uses: actions/setup-python@v4 @@ -48,7 +58,7 @@ jobs: - name: Configure run: ./configure - name: Check source - run: make -j 4 check-source + run: make -j 4 check-source BASE_REF="origin/${{ github.base_ref }}" - name: Check Generated Files have been updated run: make -j 4 check-gen-updated - name: Check docs