updating github environments

Author: jtviolet

.github/workflows/deploy.yml

@@ -12,90 +12,33 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  deploy-dev:
-    name: Deploy to Development
+  deploy:
+    name: Deploy to ${{ (github.ref == 'refs/heads/main' || github.base_ref == 'main') && 'Production' || 'Development' }}
     runs-on: ubuntu-latest
-    environment: Development
-    # ONLY run for dev branch pushes or PRs targeting dev
-    if: github.ref == 'refs/heads/dev' || (github.event_name == 'pull_request' && github.base_ref == 'dev')
+    environment: ${{ (github.ref == 'refs/heads/main' || github.base_ref == 'main') && 'Production' || 'Development' }}
     permissions:
       deployments: write
       pull-requests: write
     steps:
-      - name: Trigger Render Deploy
-        id: deploy
-        uses: JorgeLNJunior/[email protected]
-        with:
-          service_id: ${{ secrets.RENDER_SERVICE_ID }}
-          api_key: ${{ secrets.RENDER_API_KEY }}
-          wait_deploy: true
-          github_deployment: true
-          deployment_environment: Development
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set environment name
+        id: set-env
+        run: |
+          if [[ "${{ github.ref }}" == "refs/heads/main" ]] || [[ "${{ github.base_ref }}" == "main" ]]; then
+            echo "env_name=Production" >> $GITHUB_OUTPUT
+            echo "env_lower=production" >> $GITHUB_OUTPUT
+          else
+            echo "env_name=Development" >> $GITHUB_OUTPUT
+            echo "env_lower=development" >> $GITHUB_OUTPUT
+          fi
 
-      - name: Comment on PR
-        if: github.event_name == 'pull_request'
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const deployUrl = '${{ secrets.SITE_URL }}';
-            const environment = 'Development';
-            const commentIdentifier = `<!-- deployment-bot:${environment} -->`;
-            
-            const comment = `${commentIdentifier}
-            ### 🚀 Preview Deployment Ready!
-            
-            Your changes have been successfully deployed to the ${environment.toLowerCase()} environment.
-            
-            **Preview URL:** ${deployUrl}
-            
-            | Status | Environment | Commit | Time |
-            |--------|-------------|--------|------|
-            | ✅ Success | ${environment} | \`${context.sha.substring(0, 7)}\` | ${new Date().toISOString()} |
-            
-            ---
-            <sub>🤖 This comment was automatically generated by the deployment workflow.</sub>`;
-            
-            // Find existing comment
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-            });
-            
-            const botComment = comments.find(comment => 
-              comment.body.includes(commentIdentifier)
-            );
-            
-            if (botComment) {
-              // Update existing comment
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: botComment.id,
-                body: comment
-              });
-            } else {
-              // Create new comment
-              await github.rest.issues.createComment({
-                issue_number: context.issue.number,
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                body: comment
-              });
-            }
-
-  deploy-prod:
-    name: Deploy to Production
-    runs-on: ubuntu-latest
-    environment: Production
-    # ONLY run for main branch pushes or PRs targeting main
-    if: github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.base_ref == 'main')
-    permissions:
-      deployments: write
-      pull-requests: write
-    steps:
+      - name: Debug - Check Service ID
+        run: |
+          echo "Environment: ${{ steps.set-env.outputs.env_name }}"
+          echo "Service ID length: ${#RENDER_SERVICE_ID}"
+          echo "Service ID is set: $([[ -n "$RENDER_SERVICE_ID" ]] && echo "Yes" || echo "No")"
+        env:
+          RENDER_SERVICE_ID: ${{ secrets.RENDER_SERVICE_ID }}
+          
       - name: Trigger Render Deploy
         id: deploy
         uses: JorgeLNJunior/[email protected]
@@ -104,7 +47,7 @@ jobs:
           api_key: ${{ secrets.RENDER_API_KEY }}
           wait_deploy: true
           github_deployment: true
-          deployment_environment: Production
+          deployment_environment: ${{ steps.set-env.outputs.env_name }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Comment on PR
@@ -114,23 +57,21 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const deployUrl = '${{ secrets.SITE_URL }}';
-            const environment = 'Production';
+            const environment = '${{ steps.set-env.outputs.env_name }}';
             const commentIdentifier = `<!-- deployment-bot:${environment} -->`;
             
             const comment = `${commentIdentifier}
-            ### 🚀 Production Preview Deployment Ready!
+            ### 🚀 ${environment === 'Production' ? 'Production Preview' : 'Preview'} Deployment Ready!
             
-            Your changes have been successfully deployed to the ${environment.toLowerCase()} preview environment.
+            Your changes have been successfully deployed to the ${environment.toLowerCase()} ${environment === 'Production' ? 'preview ' : ''}environment.
             
             **Preview URL:** ${deployUrl}
             
             | Status | Environment | Commit | Time |
             |--------|-------------|--------|------|
             | ✅ Success | ${environment} | \`${context.sha.substring(0, 7)}\` | ${new Date().toISOString()} |
             
-            ⚠️ **Note:** This is a preview deployment for the production environment. The actual production deployment will occur after merge.
-            
-            ---
+            ${environment === 'Production' ? '⚠️ **Note:** This is a preview deployment for the production environment. The actual production deployment will occur after merge.\n\n' : ''}---
             <sub>🤖 This comment was automatically generated by the deployment workflow.</sub>`;
             
             // Find existing comment