Merge pull request #58 from iamsobanjaved/iamsobanjaved/fix-auto-merg…

…e-workflow

fix: use correct command for merging

.github/workflows/merge-python-requirements-upgrade-prs.yml

@@ -1,10 +1,17 @@
+# This file contains a workflow which will be run on schedule every day, and
+# will collect all the eligible (PRs which are labelled "Ready to merge" by our 
+# script) python upgrade PRs from both edx and openedx orgs.
+# After fetching all PRs, it will check if all the checks passing on the PR, if yes
+# then it will merge that PR, otherwise it will fail.
+
 name: Merge Python Requirements Upgrade PRs
 
 on:
   schedule:
     # will run the job at 10 AM every day (UTC),
     # https://crontab.guru/#0_10_*_*_*
     - cron: "0 10 * * *"
+  workflow_dispatch:
 
 jobs:
   get_list_of_prs:
@@ -80,11 +87,11 @@ jobs:
         env:
           GIT_TOKEN: ${{ secrets.requirements_bot_github_token }}
         run: |
-          check_pr_tests_status.py --org "$org_name" --repo "$repo_name" --pr_number "$pr_number" \
-          --exclude-contexts 'Renovate|[Cc]odecov|Dependabot|edx-platform-ci' --all-checks
+          check_pr_tests_status.py --org "${{ env.org_name }}" --repo "${{ env.repo_name }}" --pr_number \
+          "${{ env.pr_number }}" --exclude-contexts 'Renovate|[Cc]odecov|Dependabot|edx-platform-ci' --all-checks
 
       - name: Merge pull request
         env:
           GIT_TOKEN: ${{ secrets.requirements_bot_github_token }}
         run: |
-          merge_pull_request --org "${{ env.org_name }}" --repo "${{ env.repo_name }}" --pr_number
+          merge_pr.py --org "${{ env.org_name }}" --repo "${{ env.repo_name }}" --pr_number "${{ env.pr_number }}"