DIGITAL-158: Keep branch the real value, but use wildcard to set space.

GSA · Jan 3, 2025 · a7670f5 · a7670f5
1 parent 3439ed5
commit a7670f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/cloudgov-deploy-app.yml b/.github/workflows/cloudgov-deploy-app.yml
@@ -13,13 +13,10 @@ jobs:
       - name: Set enviornment
         run: |
           BRANCH=$(echo $GITHUB_REF | cut -d'/' -f 3)
-          if [[ $BRANCH == *deploydev ]]; then
-            BRANCH="develop"
-          fi
           COMPOSER_DEV=1
           GSA_AUTH_KEY=${{ secrets.GSA_AUTH_DEVELOPMENT_KEY }}
           case ${BRANCH} in
-            develop)
+            develop | *deploydev)
               CF_SPACE="dev"
               DRUPAL_MEMORY=${{ vars.DEVELOP_CMS_MEMORY }}
               DRUPAL_INSTANCES=${{ vars.DEVELOP_INSTANCES }}

diff --git a/.github/workflows/terraform-deploy-infra.yml b/.github/workflows/terraform-deploy-infra.yml
@@ -13,11 +13,8 @@ jobs:
       - name: Set env.BRANCH
         run: |
           BRANCH=$(echo $GITHUB_REF | cut -d'/' -f 3)
-          if [[ $BRANCH == *deploydev ]]; then
-            BRANCH="develop"
-          fi
           case ${BRANCH} in
-            develop)
+            develop | *deploydev)
               CF_SPACE="dev"
               ;;
             main)