update backport actions

Author: buffalojoec

.github/actions/backport/action.yml

@@ -8,13 +8,16 @@ inputs:
   base_branch:
     description: The base branch to backport to (i.e., solana-v2.0, solana-v1.18)
     required: true
+  github_token:
+    description: GitHub token for authentication
+    required: true
 
 runs:
   using: "composite"
   steps:
     - name: Fetch pull request data
       env:
-        GH_TOKEN: ${{ github.token }}
+        GITHUB_TOKEN: ${{ inputs.github_token }}
       shell: bash
       run: |
         MERGE_COMMIT=${{ github.sha }}
@@ -36,30 +39,28 @@ runs:
         else
           echo "No backport detected."
         fi
-    
-    - name: Checkout base branch
-      if : ${{ env.BACKPORT == 'true' }}
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ inputs.base_branch }}
 
     - name: Backport changes
       if: ${{ env.BACKPORT == 'true' }}
       env:
-        GITHUB_TOKEN: ${{ github.token }}
+        GITHUB_TOKEN: ${{ inputs.github_token }}
       shell: bash
       run: |
         git config user.name "github-actions[bot]"
         git config user.email "github-actions[bot]@users.noreply.github.com"
 
-        BACKPORT_BRANCH="backport-${{ env.PR_NUMBER }}-to-${{ inputs.base_branch }}"
+        git fetch --all
+
+        BASE_BRANCH="${{ inputs.base_branch }}"
+        BACKPORT_BRANCH="backport-${{ github.sha }}-to-${{ inputs.base_branch }}"
+        git checkout $BASE_BRANCH
         git checkout -b $BACKPORT_BRANCH
 
-        git cherry-pick $MERGE_COMMIT || (git cherry-pick --abort && exit 1)
+        git cherry-pick -X theirs --allow-empty $MERGE_COMMIT
 
         git push origin $BACKPORT_BRANCH
 
-        gh pr create \
+        gh pr create -v \
           --base $BASE_BRANCH \
           --head $BACKPORT_BRANCH \
           --title "Backport PR #${{ env.PR_NUMBER }} to $BASE_BRANCH" \

.github/workflows/backport-1.18.yml

@@ -0,0 +1,29 @@
+name: Backport to solana-v1.18
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  backport:
+    runs-on: ubuntu-latest
+
+    permissions:
+      pull-requests: write
+      contents: write
+
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v4
+      
+      - name: Debug Permissions
+        run: gh auth status
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        
+      - name: Backport to v1.18
+        uses: ./.github/actions/backport
+        with:
+          label: v1.18
+          base_branch: solana-v1.18
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/backport-2.0.yml

@@ -8,12 +8,22 @@ jobs:
   backport:
     runs-on: ubuntu-latest
 
+    permissions:
+      pull-requests: write
+      contents: write
+
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
+      
+      - name: Debug Permissions
+        run: gh auth status
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Backport to v2.0
         uses: ./.github/actions/backport
         with:
           label: v2.0
           base_branch: solana-v2.0
+          github_token: ${{ secrets.GITHUB_TOKEN }}