From e50041f69ba8675c261f8d8812b8f09a3cf711f3 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 21 Dec 2024 12:46:01 -0500 Subject: [PATCH] Small fixes. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 9fcc4a7a..953e733f 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -155,10 +155,9 @@ jobs: - name: Tea CLI Setup & PR Merge run: | - echo ${{ gitea.ref_name }} - curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea chmod +x /usr/local/bin/tea + echo "Merging PR..." tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}" - tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep "${{ gitea.ref_name }}" | awk -F, '{print $1}' - \ No newline at end of file + pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep "${{ gitea.ref_name }}" | awk -F, '{print $1}' | sed -e 's|"||g') + tea pr m --repo ${{ gitea.ref_name }} --output table --title "Auto Merge" --message "Merged by ${{ gitea.actor }}" \ No newline at end of file