Tweaking PR merge step.
This commit is contained in:
@@ -153,15 +153,13 @@ jobs:
|
|||||||
up: true
|
up: true
|
||||||
up-opts: -d --dry-run
|
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: |
|
run: |
|
||||||
curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
|
curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
|
||||||
chmod +x /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 }}"
|
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 }}"
|
||||||
|
tea pr m --message "Automatically merged by Gitea Actions" --output table ${PR_INDEX}
|
||||||
|
|
||||||
- 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}"
|
|
||||||
|
|||||||
Reference in New Issue
Block a user