Attempt #7 to trigger gitea-sonarqube-bot; updated merge PR step.

This commit is contained in:
2024-12-06 11:17:10 -05:00
parent 0b527b944a
commit 30956efa74
+5 -5
View File
@@ -78,12 +78,12 @@ jobs:
# echo "${{ gitea.event.pull_request.number }}" # echo "${{ gitea.event.pull_request.number }}"
# tea pr m --repo "${{ gitea.repository.name }}" --message "Automatically merged by GitHub Actions" --output table "${{ gitea.event.pull_request.number }}" # tea pr m --repo "${{ gitea.repository.name }}" --message "Automatically merged by GitHub Actions" --output table "${{ gitea.event.pull_request.number }}"
- name: Merge PR - name: Git Merge & Push
uses: uses: AlexRogalskiy/github-action-git-operation@V2.0.1 uses: morbalint/git-merge-action@v1.1.0
with: with:
mode: 'merge-fast-forward' target: 'main'
sourceBranch: $ {{ gitea.event.pull_request.head.ref }} source: ${{ gitea.event.pull_request.head.ref }}
targetBranch: 'main' dry-run: true
- name: Deploy Docker Compose Changes - name: Deploy Docker Compose Changes
uses: 5eqn/docker-compose-remote-action@v0.0.7 uses: 5eqn/docker-compose-remote-action@v0.0.7