Trez/rinoa-docker
4
0
Fork 0
Code Issues 1 Pull Requests 8 Actions 1 Activity

Adjusting PR merge step.

Browse Source
This commit is contained in:
Trez.One
2025-01-11 20:12:20 -05:00
parent ae11234e37
commit 5243f31741
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/deployment.yml
+11 -3
View File
@@ -166,12 +166,20 @@ jobs:
version: '0.9.2' version: '0.9.2'
- name: PR Merge - name: PR Merge
id: pr_merge
run: | run: |
tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
tea pr ls --repo ${{ github.repository }} --state all tea login default gitea-rinoa
pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g') pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g')
tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index} tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index}
echo "PR_INDEX=${pr_index}" >> $GITHUB_OUPUT echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT
- name: Wait for PR to be merged
run: |
while true; do
pr_state=$(tea pr ls --repo ${{ github.repository }} --state merged --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g')
if [ "${pr_state}" == "merged" ]; then
break
- name: Gotify Notification - name: Gotify Notification
uses: eikendev/gotify-action@master uses: eikendev/gotify-action@master
@@ -189,7 +197,7 @@ jobs:
approvers: Trez.One approvers: Trez.One
minimum-approvals: 1 minimum-approvals: 1
approval-wait: 600 approval-wait: 600
issue-title: 'Manual Approval for #${pr_index} - ${{ gitea.ref_name }}' issue-title: 'Manual Approval for #${{ steps.pr_merge.outputs.pr_index }} - ${{ gitea.ref_name }}'
issue-body: | issue-body: |
"Autobots, roll out!" "Autobots, roll out!"