Breaking out merge and trigger into separate jobs (testing trigger).

.gitea/workflows/deployment.yml

@@ -159,14 +159,13 @@ jobs:
           message: "chore: Update README"
           add: "README.md"
 
-  trigger-and-merge:
+  manual-trigger-deploy:
-    name: Trigger Deployment
+    name: Manual Trigger
-    needs: [generate-readme, docker-compose-test, regenerate-readme]
+    needs: [docker-compose-test, cloudflare-dns-setup, regenerate-readme]
+    outputs:
+      CONTINUE_JOBS: ${{ steps.manual-trigger.outputs.CONTINUE_JOBS }}
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
         with:
@@ -175,18 +174,19 @@ jobs:
           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
+      - name: Manual Trigger
+        uses: benhamiltonpro/manual-trigger@v1.0.2
         id: manual-trigger
-        uses: trstringer/manual-approval@v1.9.1
         with:
-          secret: ${{ secrets.BOT_GITEA_TOKEN }}
+          RUN_NAME: "pr-merge"
-          approvers: Trez.One
+
-          minimum-approvals: 1
+  pr-merge:
-          issue-title: "Deploying ${{ github.ref_name }} (PR #{{ steps.pr_merge.outputs.pr_index }})"
+    name: Trigger Deployment
-          issue-body: "Testing for now"
+    if: ${{ needs.manual-trigger-deploy.outputs.CONTINUE_JOBS == 'true' }}
-          exclude-workflow-initiator-as-approver: false
+    runs-on: ubuntu-latest
-          additional-approved-words: ''
+    steps:
-          additional-denied-words: ''
+      - name: Checkout
+        uses: actions/checkout@v4
 
   #     - name: PR Merge
   #       id: pr_merge
@@ -207,10 +207,10 @@ jobs:
   # docker-compose-deploy:
   #   name: Deploy via Docker Compose
   #   runs-on: ubuntu-latest
-  #   needs: [merge-and-trigger]
+  #   needs: [pr-merge]
   #   env:
   #     VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }}
-  #     VAULT_TOKEN: ${{ secrets.RINOA_VAULT_TOKEN }}
+  #     VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
   #     DOCKER_HOST: tcp://dockerproxy:2375
   #   environment: approval-environment
   #   steps: