Tweaking PR merge step.

2024-12-21 09:51:28 -05:00
parent 980ec39a79
commit e81953459d
1 changed files with 6 additions and 8 deletions
@@ -153,15 +153,13 @@ jobs:
          up: true
          up-opts: -d --dry-run

-      - name: Install & Setup Tea CLI
+      - name: ITea CLI Setup & PR Merge
+        env:
+            PR_NUMBER: ${{ github.event.pull_request.number }}
+            RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}
        run: |
          curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
          chmod +x /usr/local/bin/tea
          tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_SERVER }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"          
-
-      - name: Merge PR with Tea CLI
-        env:
-          PR_INDEX: ${{ needs.check-and-create-pr.outputs.pr_number }}
-        run: |
-          echo "${{ gitea.event.pull_request.number }}"
-          tea pr m --message "Automatically merged by Gitea Actions" --output table "${PR_INDEX}"
+          tea pr m --message "Automatically merged by Gitea Actions" --output table ${PR_INDEX}
+