Removing manual trigger...

2025-01-14 10:28:18 -05:00
parent 2dbe6b7a3b
commit f684f60e95
1 changed files with 40 additions and 62 deletions
@@ -159,76 +159,54 @@ jobs:
          message: "chore: Update README"
          add: "README.md"

-  manual-trigger-deploy:
-    name: Manual Trigger
-    needs: [docker-compose-test, cloudflare-dns-setup, regenerate-readme]
-    outputs:
-      CONTINUE_JOBS: ${{ steps.manual-trigger.outputs.CONTINUE_JOBS }}
-    runs-on: ubuntu-latest
-    steps:
-      - 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
-        uses: benhamiltonpro/manual-trigger@v1.0.2
-        id: manual-trigger
-        with:
-          RUN_NAME: "pr-merge"
-
  pr-merge:
-    name: Trigger Deployment
-    if: ${{ needs.manual-trigger-deploy.outputs.CONTINUE_JOBS == 'true' }}
+    name: PR Merge
+    needs: [regenerate-readme]
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v4

-  #     - name: PR Merge
-  #       id: pr_merge
-  #       run: |
-  #         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 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: PR Merge
+        id: pr_merge
+        run: |
+          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 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
+      - 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
-  #   runs-on: ubuntu-latest
-  #   needs: [pr-merge]
-  #   env:
-  #     VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }}
-  #     VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
-  #     DOCKER_HOST: tcp://dockerproxy:2375
-  #   environment: approval-environment
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
-  #       with:
-  #         ref: main
+  docker-compose-deploy:
+    name: Deploy via Docker Compose
+    runs-on: ubuntu-latest
+    needs: [pr-merge]
+    env:
+      VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }}
+      VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
+      DOCKER_HOST: tcp://dockerproxy:2375
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: main

-  #     - name: Install Vault
-  #       uses: cpanato/vault-installer@main
+      - name: Install Vault
+        uses: cpanato/vault-installer@main

-  #     - name: Generate .env file for deployment
-  #       run: |
-  #          vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
+      - name: Generate .env file for deployment
+        run: |
+           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env

-  #     - name: Docker Compose Deployment
-  #       uses: Autom3/docker-deployment-action@3.0.1
-  #       with: 
-  #         remote_docker_host: gitea-deploy@192.168.1.254
-  #         ssh_private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }}
-  #         ssh_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }}
+      - name: Docker Compose Deployment
+        uses: Autom3/docker-deployment-action@3.0.1
+        with: 
+          remote_docker_host: gitea-deploy@192.168.1.254
+          ssh_private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }}
+          ssh_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }}