Skip to content

Commit e0d2c39

Browse files
committed
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 <[email protected]>
1 parent 3ac949d commit e0d2c39

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

.github/workflows/ci.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@ jobs:
3030
steps:
3131
- name: Checkout
3232
uses: actions/checkout@v3
33+
with:
34+
ref: ${{ github.event.pull_request.head.sha }}
35+
fetch-depth: 0
36+
37+
- name: Rebase
38+
run: |
39+
git config user.name github-actions
40+
git config user.email [email protected]
41+
git fetch origin ${{ github.base_ref }}
42+
git rebase origin/${{ github.base_ref }}
3343
3444
- name: Set up Python 3.7
3545
uses: actions/setup-python@v4
@@ -48,7 +58,7 @@ jobs:
4858
- name: Configure
4959
run: ./configure
5060
- name: Check source
51-
run: make -j 4 check-source
61+
run: make -j 4 check-source BASE_REF="origin/${{ github.base_ref }}"
5262
- name: Check Generated Files have been updated
5363
run: make -j 4 check-gen-updated
5464
- name: Check docs

0 commit comments

Comments
 (0)