Ensure all "cd" workflows have workflow_dispatch and we honor the env…

…ironment if we're in that path
HHS · Nov 22, 2024 · c8da601 · c8da601
1 parent 35fb5d6
commit c8da601
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 1 deletion.
diff --git a/.github/workflows/cd-analytics-infra.yml b/.github/workflows/cd-analytics-infra.yml
@@ -52,7 +52,11 @@ jobs:
       fail-fast: false
       matrix:
         directory: ["database", "service"]
+<<<<<<< HEAD
         envs: ${{ inputs.environment || github.event_name == 'release' && fromJSON('["prod"]') || github.ref_name == 'main' && fromJSON('["dev", "staging"]') || fromJSON('["dev"]') }}
+=======
+        envs: ${{ fromJSON(inputs.environment != null && format('["{0}"]', inputs.environment) || github.event_name == 'release' && '["prod"]' || github.ref_name == 'main' && '["dev", "staging"]' || '["dev"]')  }}
+>>>>>>> 99b9921a (Ensure all "cd" workflows have workflow_dispatch and we honor the environment if we're in that path)
 
     permissions:
       contents: read

diff --git a/.github/workflows/cd-analytics.yml b/.github/workflows/cd-analytics.yml
@@ -41,7 +41,11 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
+<<<<<<< HEAD
         envs: ${{ inputs.environment || github.event_name == 'release' && fromJSON('["prod"]') || github.ref_name == 'main' && fromJSON('["dev", "staging"]') || fromJSON('["dev"]') }}
+=======
+        envs: ${{ fromJSON(inputs.environment != null && format('["{0}"]', inputs.environment) || github.event_name == 'release' && '["prod"]' || github.ref_name == 'main' && '["dev", "staging"]' || '["dev"]')  }}
+>>>>>>> 99b9921a (Ensure all "cd" workflows have workflow_dispatch and we honor the environment if we're in that path)
     with:
       app_name: "analytics"
       environment: ${{ matrix.envs }}

diff --git a/.github/workflows/cd-api-infra.yml b/.github/workflows/cd-api-infra.yml
@@ -52,7 +52,11 @@ jobs:
       fail-fast: false
       matrix:
         directory: ["database", "service"]
+<<<<<<< HEAD
         envs: ${{ inputs.environment || github.event_name == 'release' && fromJSON('["prod"]') || github.ref_name == 'main' && fromJSON('["dev", "staging"]') || fromJSON('["dev"]') }}
+=======
+        envs: ${{ fromJSON(inputs.environment != null && format('["{0}"]', inputs.environment) || github.event_name == 'release' && '["prod"]' || github.ref_name == 'main' && '["dev", "staging"]' || '["dev"]')  }}
+>>>>>>> 99b9921a (Ensure all "cd" workflows have workflow_dispatch and we honor the environment if we're in that path)
 
     permissions:
       contents: read

diff --git a/.github/workflows/cd-api.yml b/.github/workflows/cd-api.yml
@@ -40,7 +40,11 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
+<<<<<<< HEAD
         envs: ${{ inputs.environment || github.event_name == 'release' && fromJSON('["prod"]') || github.ref_name == 'main' && fromJSON('["dev", "staging"]') || fromJSON('["dev"]') }}
+=======
+        envs: ${{ fromJSON(inputs.environment != null && format('["{0}"]', inputs.environment) || github.event_name == 'release' && '["prod"]' || github.ref_name == 'main' && '["dev", "staging"]' || '["dev"]')  }}
+>>>>>>> 99b9921a (Ensure all "cd" workflows have workflow_dispatch and we honor the environment if we're in that path)
     with:
       app_name: "api"
       environment: ${{ matrix.envs }}

diff --git a/.github/workflows/cd-frontend-infra.yml b/.github/workflows/cd-frontend-infra.yml
@@ -52,7 +52,11 @@ jobs:
       fail-fast: false
       matrix:
         directory: ["service"]
+<<<<<<< HEAD
         envs: ${{ inputs.environment || github.event_name == 'release' && fromJSON('["prod"]') || github.ref_name == 'main' && fromJSON('["dev", "staging"]') || fromJSON('["dev"]') }}
+=======
+        envs: ${{ fromJSON(inputs.environment != null && format('["{0}"]', inputs.environment) || github.event_name == 'release' && '["prod"]' || github.ref_name == 'main' && '["dev", "staging"]' || '["dev"]')  }}
+>>>>>>> 99b9921a (Ensure all "cd" workflows have workflow_dispatch and we honor the environment if we're in that path)
 
     permissions:
       contents: read

diff --git a/.github/workflows/cd-frontend.yml b/.github/workflows/cd-frontend.yml
@@ -40,7 +40,11 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
+<<<<<<< HEAD
         envs: ${{ inputs.environment || github.event_name == 'release' && fromJSON('["prod"]') || github.ref_name == 'main' && fromJSON('["dev", "staging"]') || fromJSON('["dev"]') }}
+=======
+        envs: ${{ fromJSON(inputs.environment != null && format('["{0}"]', inputs.environment) || github.event_name == 'release' && '["prod"]' || github.ref_name == 'main' && '["dev", "staging"]' || '["dev"]')  }}
+>>>>>>> 99b9921a (Ensure all "cd" workflows have workflow_dispatch and we honor the environment if we're in that path)
     with:
       app_name: "frontend"
       environment: ${{ matrix.envs }}

diff --git a/.github/workflows/cd-metabase.yml b/.github/workflows/cd-metabase.yml
@@ -26,7 +26,7 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        envs: ${{ inputs.environment || github.event_name == 'release' && fromJSON('["prod"]') || github.ref_name == 'main' && fromJSON('["dev", "staging"]') || fromJSON('["dev"]') }}
+        envs: ${{ fromJSON(format('["{0}"]', inputs.environment))  }}
     with:
       version: ${{ inputs.image-tag }}
       environment: ${{ matrix.envs }}