From e81953459d5bff5b9e489ac712ff39edec1ae1d4 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 21 Dec 2024 09:51:28 -0500 Subject: [PATCH] Tweaking PR merge step. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index e81f946c..c034ac99 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -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} +