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 <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2023-06-01 15:45:27 +09:30
parent 3ac949d4c3
commit e0d2c39565

View File

@ -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