From 5ea99578a837575fccdccef65ad01d60c7ea6118 Mon Sep 17 00:00:00 2001
From: Elle Mouton <elle.mouton@gmail.com>
Date: Wed, 2 Nov 2022 08:05:07 +0200
Subject: [PATCH] github: check commits against base branch

---
 .github/workflows/main.yml                 | 8 ++++----
 docs/release-notes/release-notes-0.16.0.md | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 03e6aa940..bb334bdde 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -116,16 +116,16 @@ jobs:
         with:
           go-version: '${{ env.GO_VERSION }}'
 
-      - name: fetch and rebase on master
+      - name: fetch and rebase on ${{ github.base_ref }}
         run: |
-          git remote add upstream https://github.com/lightningnetwork/lnd
+          git remote add upstream https://github.com/${{ github.repository }}
           git fetch upstream
           export GIT_COMMITTER_EMAIL="lnd-ci@example.com"
           export GIT_COMMITTER_NAME="LND CI"
-          git rebase upstream/master
+          git rebase upstream/${{ github.base_ref }}
 
       - name: check commits
-        run: scripts/check-each-commit.sh upstream/master
+        run: scripts/check-each-commit.sh upstream/${{ github.base_ref }}
 
   ########################
   # lint code
diff --git a/docs/release-notes/release-notes-0.16.0.md b/docs/release-notes/release-notes-0.16.0.md
index e40234067..1832d0a95 100644
--- a/docs/release-notes/release-notes-0.16.0.md
+++ b/docs/release-notes/release-notes-0.16.0.md
@@ -195,6 +195,10 @@ certain large transactions](https://github.com/lightningnetwork/lnd/pull/7100).
 * [`golangci-lint` will now check new code using additional
   linters.](https://github.com/lightningnetwork/lnd/pull/7064)
 
+* Update github actions to [check commits against the target base 
+  branch](https://github.com/lightningnetwork/lnd/pull/7103) rather than just 
+  using the master branch. 
+
 ### Integration test
 
 The `lntest` has been