simplify deploy_to_environment using deploy_cedarproxy workflow

CMS-Enterprise · May 15, 2024 · 20a77e9 · 20a77e9
1 parent 852ac02
commit 20a77e9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/.github/workflows/deploy_pipeline.yml b/.github/workflows/deploy_pipeline.yml
@@ -47,40 +47,23 @@ jobs:
     with:
       env: dev
       lambda_version: 10
-    secrets: inherit
-  deploy_cedarproxy_dev:
-    needs: [deploy_dev]
-    uses: ./.github/workflows/deploy_cedarproxy.yml
-    with:
-      env: dev
       force_cedarproxy: false
+    secrets: inherit
 
   deploy_impl:
     needs: [deploy_dev, Build_Frontend_Assets]
     uses: ./.github/workflows/deploy_to_environment.yml
     with:
       env: impl
+      force_cedarproxy: false
       lambda_version: 9
     secrets: inherit
-
-  deploy_cedarproxy_impl:
-    needs: [deploy_impl]
-    uses: ./.github/workflows/deploy_cedarproxy.yml
-    with:
-      env: impl
-      force_cedarproxy: false
 
   deploy_prod:
     needs: [deploy_impl, Build_Frontend_Assets]
     uses: ./.github/workflows/deploy_to_environment.yml
     with:
       env: prod
+      force_cedarproxy: false
       lambda_version: 8
     secrets: inherit
-
-  deploy_cedarproxy_prod:
-    needs: [deploy_prod]
-    uses: ./.github/workflows/deploy_cedarproxy.yml
-    with:
-      env: prod
-      force_cedarproxy: false
diff --git a/.github/workflows/deploy_to_environment.yml b/.github/workflows/deploy_to_environment.yml
@@ -9,6 +9,10 @@ on:
       lambda_version:
         required: true
         type: string
+      force_cedarproxy:
+        required: true
+        type: boolean
+        default: false
 
 env:
   EASI_APP_NODE_VERSION: "16.14.0"
@@ -29,6 +33,13 @@ jobs:
         run: |
           echo "Deploy confirmed! 🚀"
   
+  deploy_cedarproxy:
+    needs: [confirm_deploy]
+    uses: ./.github/workflows/deploy_cedarproxy.yml
+    with:
+      env: ${{ inputs.env }}
+      force_cedarproxy: false
+
   database_actions:
     runs-on: ubuntu-latest
     needs: confirm_deploy