chore: fix combined PR action to work with poetry lock (#3430)

Author: Panaetius

.github/workflows/combine-dependabot-updates.yml

@@ -1,6 +1,17 @@
 name: "Combine Dependabot PRs"
 on:
   workflow_dispatch:
+    inputs:
+      target_branch:
+        description: Target branch to create a release/PR to
+        type: string
+        required: true
+        default: develop
+      branch_name:
+        description: Name of the branch to combine PRs into
+        type: string
+        required: true
+        default: combined-prs-branch
 
 jobs:
   combine-prs:
@@ -10,16 +21,79 @@ jobs:
         with:
           fetch-depth: 0
           token: "${{ secrets.RENKUBOT_GITHUB_TOKEN }}"
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.11
+      - name: Install dependencies
+        env:
+          POETRY_VIRTUALENVS_CREATE: "false"
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install poetry
+      - name: Set Git config
+        shell: bash
+        run: |
+          git config --global --add user.name "Renku Bot"
+          git config --global --add user.email "[email protected]"
       - name: Setup local branch and merge tool
         run: |
-          git branch --track dependabot-updates origin/dependabot-updates
+          git branch --track "${{ inputs.branch_name }}"  "origin/${{ inputs.branch_name }}" || git checkout "${{ inputs.branch_name }}"
           echo "poetry.lock merge=ours" >> .git/info/attributes
           git config merge.ours.driver true
-      - uses: github/combine-prs@main
+          git merge --no-edit develop
+      - name: Merge PRs
+        id: merge_prs
+        env:
+          POETRY_VIRTUALENVS_CREATE: "false"
+        run: |
+          repo="https://api.github.com/repos/${{ github.repository }}"
+          dependabot_pulls=($(curl -s "$repo/pulls?state=open" | jq -r ".[] | select((.head.ref | test(\"dependabot/\"))) | \"\(.head.ref),\(.number)\""))
+
+          pr_body="# Combined PRs\n✅ The following pull requests have been successfully combined on this PR:\n"
+          failed=()
+
+          for branch in "${dependabot_pulls[@]}"; do
+            branch_arr=(${branch//,/ })
+            echo "Merging branch ${branch_arr[0]}"
+
+            if git merge --no-edit "origin/${branch_arr[0]}"; then
+              pr_body="$pr_body\n- #${branch_arr[1]}"
+            else
+              failed+=(${branch_arr[1]})
+            fi
+          done
+
+          if (( ${#failed[@]} )); then
+            pr_body="$pr_body\n\nFailed to combine:\n"
+
+            for fail in "${failed[@]}"; do
+              pr_body="$pr_body\n- #$fail"
+            done
+          fi
+          poetry lock
+          git add -A
+          git commit -m "update lock file" --no-verify
+          git push
+          echo "pr_body=$pr_body" >> $GITHUB_OUTPUT
+      - name: Create Pull Request
+        uses: actions/github-script@v6
         with:
-          branch_prefix: "dependabot"
-          ci_required: false
-          ignore_label: "nocombine"
-          open_pr: true
-          github_token: "${{ secrets.RENKUBOT_GITHUB_TOKEN }}"
-          pr_title: "chore: combined dependency update"
+          token: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
+          script: |
+            const { repo, owner } = context.repo;
+            const result = await github.rest.pulls.create({
+              title: 'chore: combined dependency update',
+              owner,
+              repo,
+              head: '${{ inputs.branch_name }}',
+              base: '${{ github.event.inputs.target_branch }}',
+              body: '${{ steps.merge_prs.outputs.pr_body }}'
+            });
+            github.rest.issues.addLabels({
+              owner,
+              repo,
+              issue_number: result.data.number,
+              labels: ['dependencies', 'automated pr']
+            });