diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 6824075f..9bf65e10 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -181,14 +181,7 @@ jobs: 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') 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_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 docker-compose-deploy: name: Deploy via Docker Compose