From 774ed44a4d9c37b1dd26dc6e780345bcfd69cd8e Mon Sep 17 00:00:00 2001
From: Whiteflight <hotobznz@skatteverket.se>
Date: Wed, 2 Oct 2024 08:45:00 +0200
Subject: [PATCH] fix: Fix spelling and order of branches in workflow

Signed-off-by: Whiteflight <hotobznz@skatteverket.se>
---
 .github/workflows/fast_forward.yml | 61 ++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/fast_forward.yml b/.github/workflows/fast_forward.yml
index 6c439ac1..ffcc014c 100644
--- a/.github/workflows/fast_forward.yml
+++ b/.github/workflows/fast_forward.yml
@@ -9,22 +9,69 @@ on:
   issue_comment:
     types: [created]
 
+permissions:
+  contents: read
+
 jobs:
   fast_forward_job:
     name: Fast Forward
     if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/fast-forward')   
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+
     steps:
       # To use this repository's private action, you must check out the repository
       - name: Checkout
         uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 #v4.2.0
 
-      # Basic use case example
-      - name: Fast Forward PR
-        id: ff-action
-        uses: endre-spotlab/fast-forward-js-action@2.1
+      # Get details of the PR. The target and base branch. And also whether the PR can be merged in or not.
+      - name: Get PR details
+        uses: octokit/request-action@v2.3.1
+        id: get-pr-details
+        with:
+          route: GET /repos/{repository}/pulls/{pull_number}
+          repository: ${{ github.repository }}
+          pull_number: ${{ github.event.issue.number }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # Merge (rebase) the PR if it is allowed.
+      - name: Fast forward the PR
+        id: merge-status
+        shell: bash
+        env:
+          HEAD_BRANCH: ${{ fromJson(steps.get-pr-details.outputs.data).head.ref }}
+          BASE_BRANCH: ${{ fromJson(steps.get-pr-details.outputs.data).base.ref }}
+        run: |
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "GitHub Actions"        
+          git checkout $HEAD_BRANCH
+          git checkout $BASE_BRANCH
+          git merge $HEAD_BRANCH --ff-only
+          git push
+          echo "::set-output name=message::'Fast forward successful.'"
+
+      # Post a success/failure comment to the PR.
+      - name: Add comment to PR
+        uses: octokit/request-action@v2.3.1
         with:
+          route: POST /repos/{repository}/issues/{issue_number}/comments
+          repository: ${{ github.repository }}
+          issue_number: ${{ github.event.issue.number }}
+          body: ${{ steps.merge-status.outputs.message }}
+        env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          success_message: 'Success! Fast forwarded ***target_base*** to ***source_head***! ```git checkout target_base && git merge source_head --ff-only``` '
-          failure_message: 'Failed! Cannot do fast forward!'
-          production_branch: 'main'
+
+      # Post a failure message when any of the previous steps fail.
+      - name: Add failure comment to PR
+        if: ${{ failure() }}
+        uses: octokit/request-action@v2.3.1
+        with:
+          route: POST /repos/{repository}/issues/{issue_number}/comments
+          repository: ${{ github.repository }}
+          issue_number: ${{ github.event.issue.number }}
+          body: Unable to fast forward. Check the Actions execution tab for details.
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file