...
This commit is contained in:
@@ -73,7 +73,6 @@ jobs:
|
|||||||
key: ${{secrets.RINOA_ANSIBLE_PRIVATE_KEY}}
|
key: ${{secrets.RINOA_ANSIBLE_PRIVATE_KEY}}
|
||||||
options: |
|
options: |
|
||||||
--inventory inventory/hosts.yml
|
--inventory inventory/hosts.yml
|
||||||
--diff
|
|
||||||
--check
|
--check
|
||||||
requirements: collections/requirements.yml
|
requirements: collections/requirements.yml
|
||||||
vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
|
vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
|
||||||
@@ -199,6 +198,7 @@ jobs:
|
|||||||
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 }}
|
||||||
echo "Setting default login for Gitea..."
|
echo "Setting default login for Gitea..."
|
||||||
tea login default gitea-rinoa
|
tea login default gitea-rinoa
|
||||||
|
echo "Merging PR..."
|
||||||
pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.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 ${{ github.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g')
|
||||||
echo "${pr_index}"
|
echo "${pr_index}"
|
||||||
tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" --output table ${pr_index}
|
tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" --output table ${pr_index}
|
||||||
|
|||||||
Reference in New Issue
Block a user