Merge remote-tracking branch 'origin/develop' into feature/GH-7-review-the-actions-for-comment-on-prs-and-trigger-deployments

Author: TheRustifyer

.github/workflows/deploy-pre-chatbot.yml

@@ -4,7 +4,6 @@ on:
   issue_comment:
     types:
       - created
-
 jobs:
   handle-slash-command:
     runs-on: ubuntu-latest
@@ -13,19 +12,16 @@ jobs:
       # Step 1: Verify Command in Comment
       - name: Check for `/deploy-pre` Command
         id: check_command
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const comment = context.payload.comment.body;
-            console.log("Comment received:", comment);
-            if (comment.trim() === '/deploy-pre') {
-              console.log("Command `/deploy-pre` found.");
-              return { valid: true };
-            }
-            console.log("No valid command found.");
-            return { valid: false };
-          result-encoding: json
-          result: 'steps.check_command.outputs.valid'
+        run: |
+          COMMENT_BODY="${{ github.event.comment.body }}"
+          echo "Comment received: $COMMENT_BODY"
+          if [[ "$COMMENT_BODY" == "/deploy-pre" ]]; then
+            echo "Command `/deploy-pre` found."
+            echo "valid=true" >> $GITHUB_OUTPUT
+          else
+            echo "No valid command found."
+            echo "valid=false" >> $GITHUB_OUTPUT
+          fi
 
       # Step 2: Debug Command Check
       - name: Debug Command Check
@@ -36,36 +32,48 @@ jobs:
       - name: Extract PR Branch
         if: steps.check_command.outputs.valid == 'true'
         id: pr_details
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const pr = context.payload.issue.pull_request;
-            if (!pr) {
-              throw new Error("This command can only be used on a pull request.");
-            }
-            console.log("PR branch:", pr.head.ref);
-            return pr.head.ref;
-          result-encoding: string
+        run: |
+          PR_NUMBER="${{ github.event.issue.number }}"
+          REPO_OWNER="${{ github.repository_owner }}"
+          REPO_NAME="${{ github.event.repository.name }}"
+          
+          echo "Fetching PR details for PR #$PR_NUMBER"
+          
+          # Use GitHub REST API to fetch the PR details
+          PR_DETAILS=$(curl -s \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            "https://api.github.com/repos/$REPO_OWNER/$REPO_NAME/pulls/$PR_NUMBER")
+
+          # Extract the branch name (head.ref)
+          BRANCH=$(echo "$PR_DETAILS" | jq -r '.head.ref')
+          
+          # Output the branch name for debugging
+          echo "PR branch: $BRANCH"
+          
+          # Set the branch name as an output
+          echo "branch=$BRANCH" >> $GITHUB_OUTPUT
 
       # Step 4: Debug PR Branch
       - name: Debug PR Branch
         if: steps.check_command.outputs.valid == 'true'
         run: |
-          echo "Branch: ${{ steps.pr_details.outputs.result }}"
+          echo "Branch: ${{ steps.pr_details.outputs.branch }}"
 
       # Step 5: Trigger Deploy Workflow
       - name: Trigger Deploy Workflow
         if: steps.check_command.outputs.valid == 'true'
         uses: actions/github-script@v6
         with:
           script: |
+            const branch = '${{ steps.pr_details.outputs.branch }}';  # Access the branch directly as a string
             github.rest.actions.createWorkflowDispatch({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              workflow_id: "deploy-pre.yml", # Replace with your deployment workflow filename
-              ref: "${{ steps.pr_details.outputs.result }}"
-            })
-            console.log("Triggered deploy-pre workflow for branch:", "${{ steps.pr_details.outputs.result }}");
+              workflow_id: "deploy-pre.yml",  # Replace with your workflow file
+              ref: branch,
+            });
+            console.log("Triggered deploy-pre workflow for branch:", branch);
+
 
       # Step 6: Post Confirmation Comment
       - name: Post Comment to PR
@@ -78,6 +86,6 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               issue_number: issue_number,
-              body: `✅ Workflow \`deploy-pre.yml\` has been triggered for branch \`${{ steps.pr_details.outputs.result }}\`.`
+              body: `✅ Workflow \`deploy-pre.yml\` has been triggered for branch \`${{ steps.pr_details.outputs.branch }}\`.`
             });
             console.log("Commented back to PR:", issue_number);