Re-adding trigger.

.gitea/workflows/deployment.yml

@@ -149,7 +149,6 @@ jobs:
       - name: Regenerate README
         run: |
           echo "# List of Services" > README.md
-          echo "___________________________________________" >> README.md
           echo -e "\n\n" >> README.md
           echo "${{ steps.service-table.outputs.table }}" >> README.md
 
@@ -160,14 +159,35 @@ jobs:
           message: "chore: Update README"
           add: "README.md"
 
-  # merge-and-trigger:
+  trigger-and-merge:
-  #   name: Merge PR & Trigger Deployment
+    name: Merge PR & Trigger Deployment
-  #   if: ${{ regenerate-readme.outputs.pr-pushed == 'true' }}
+    if: ${{ regenerate-readme.outputs.pr-pushed == 'true' }}
-  #   needs: [generate-readme, docker-compose-test, regenerate-readme]
+    needs: [generate-readme, docker-compose-test, regenerate-readme]
-  #   runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-  #   steps:
+    steps:
-  #     - name: Checkout
+      - name: Checkout
-  #       uses: actions/checkout@v4
+        uses: actions/checkout@v4
+
+      - name: Gotify Notification
+        uses: eikendev/gotify-action@master
+        with:
+          gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}'
+          gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}'
+          notification_title: 'Ready to Deploy'
+          notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}'
+
+      - name: manual-trigger
+        id: manual-trigger
+        uses: trstringer/manual-approval@v1.9.1
+        with:
+          secret: ${{ secrets.BOT_GITEA_TOKEN }}
+          approvers: Trez.One
+          minimum-approvals: 1
+          issue-title: "Deploying ${{ github.ref_name }} (PR #{{ steps.pr_merge.outputs.pr_index }})"
+          issue-body: "Testing for now"
+          exclude-workflow-initiator-as-approver: false
+          additional-approved-words: ''
+          additional-denied-words: ''
 
       # - name: PR Merge
       #   id: pr_merge
@@ -185,27 +205,6 @@ jobs:
       #       if [ "${pr_state}" == "merged" ]; then
       #         break
 
-  #     - name: Gotify Notification
-  #       uses: eikendev/gotify-action@master
-  #       with:
-  #         gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}'
-  #         gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}'
-  #         notification_title: 'Ready to Deploy'
-  #         notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}'
-
-  #     - name: manual-trigger
-  #       id: manual-trigger
-  #       uses: trstringer/manual-approval@v1.9.1
-  #       with:
-  #         secret: ${{ secrets.BOT_GITEA_TOKEN }}
-  #         approvers: Trez.One
-  #         minimum-approvals: 1
-  #         issue-title: "Deploying ${{ github.ref_name }} (PR #{{ steps.pr_merge.outputs.pr_index }})"
-  #         issue-body: "Testing for now"
-  #         exclude-workflow-initiator-as-approver: false
-  #         additional-approved-words: ''
-  #         additional-denied-words: ''
-
   # docker-compose-deploy:
   #   name: Deploy via Docker Compose
   #   runs-on: ubuntu-latest