From 0c5d058ae4b5af9cc46767da94428ac6930e4dac Mon Sep 17 00:00:00 2001
From: TheSola10 <me@thesola.io>
Date: Tue, 30 Jan 2024 12:07:23 +0100
Subject: [PATCH 1/2] Added GitHub Action to rebase release PRs to develop

---
 .github/workflows/rebase-pr.yaml | 34 ++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/workflows/rebase-pr.yaml

diff --git a/.github/workflows/rebase-pr.yaml b/.github/workflows/rebase-pr.yaml
new file mode 100644
index 00000000..09ab04e3
--- /dev/null
+++ b/.github/workflows/rebase-pr.yaml
@@ -0,0 +1,34 @@
+#
+# This workflow catches PRs made to 'release' and rebases them onto 'develop'
+#
+
+name: rebase-pr
+
+on:
+  pull_request:
+    types: [opened]
+    branches:
+      - release
+
+jobs:
+  rebase-pr:
+    name: Rebase pull request
+    runs-on: ubuntu-latest
+    steps:
+      - name: Perform rebase
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.pulls.update({
+              pull_number = context.pull.number,
+              owner = context.repo.owner,
+              repo = context.repo.repo,
+
+              base = "develop"
+            });
+            github.rest.issues.createComment({
+              issue_number = context.pull.number,
+              owner = context.repo.owner,
+              repo = context.repo.repo,
+              body = "Thanks for your contribution! We don't accept pull requests to the `release` branch. I have rebased your pull request onto `develop`, check for any conflicts."
+            });

From 13e26ea1e1ef5c34f845db7e8f8fb1ee28ed69fb Mon Sep 17 00:00:00 2001
From: Karim Vergnes <me@thesola.io>
Date: Fri, 2 Feb 2024 18:57:34 +0100
Subject: [PATCH 2/2] fixed syntax errors

---
 .github/workflows/rebase-pr.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/rebase-pr.yaml b/.github/workflows/rebase-pr.yaml
index 09ab04e3..19ebccc2 100644
--- a/.github/workflows/rebase-pr.yaml
+++ b/.github/workflows/rebase-pr.yaml
@@ -20,15 +20,15 @@ jobs:
         with:
           script: |
             github.rest.pulls.update({
-              pull_number = context.pull.number,
-              owner = context.repo.owner,
-              repo = context.repo.repo,
+              pull_number: context.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
 
-              base = "develop"
+              base: "develop"
             });
             github.rest.issues.createComment({
-              issue_number = context.pull.number,
-              owner = context.repo.owner,
-              repo = context.repo.repo,
-              body = "Thanks for your contribution! We don't accept pull requests to the `release` branch. I have rebased your pull request onto `develop`, check for any conflicts."
+              issue_number: context.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: "Thanks for your contribution! We don't accept pull requests to the `release` branch. I have rebased your pull request onto `develop`, check for any conflicts."
             });