From dec025cc4adbb0dfa7b5c6a058eb4caa76d85d00 Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Tue, 21 Nov 2023 12:23:09 -0600
Subject: [PATCH] Use cf_manifest to specify the manifest location

---
 .github/workflows/deploy-sandbox.yaml | 2 +-
 .github/workflows/deploy-stable.yaml  | 3 +--
 .github/workflows/deploy-staging.yaml | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml
index 3755b0edf..4e5e159d5 100644
--- a/.github/workflows/deploy-sandbox.yaml
+++ b/.github/workflows/deploy-sandbox.yaml
@@ -50,12 +50,12 @@ jobs:
           ENVIRONMENT: ${{ needs.variables.outputs.environment }}
           CF_USERNAME: CF_${{ needs.variables.outputs.environment }}_USERNAME
           CF_PASSWORD: CF_${{ needs.variables.outputs.environment }}_PASSWORD
-          MANIFEST: ops/manifests/manifest-${{ needs.variables.outputs.environment }}.yaml
         with:
           cf_username: ${{ secrets[env.CF_USERNAME] }}
           cf_password: ${{ secrets[env.CF_PASSWORD] }}
           cf_org: cisa-dotgov
           cf_space: ${{ env.ENVIRONMENT }}
+          cf_manifest: ops/manifests/manifest-${{ env.environment }}.yaml
   comment:
     runs-on: ubuntu-latest
     needs: [variables, deploy]
diff --git a/.github/workflows/deploy-stable.yaml b/.github/workflows/deploy-stable.yaml
index bc8daf403..1e643ef9a 100644
--- a/.github/workflows/deploy-stable.yaml
+++ b/.github/workflows/deploy-stable.yaml
@@ -31,10 +31,9 @@ jobs:
         run: docker compose run app python manage.py collectstatic --no-input
       - name: Deploy to cloud.gov sandbox
         uses: cloud-gov/cg-cli-tools@main
-        env:
-          MANIFEST: "ops/manifests/manifest-stable.yaml"
         with:
           cf_username: ${{ secrets.CF_STABLE_USERNAME }}
           cf_password: ${{ secrets.CF_STABLE_PASSWORD }}
           cf_org: cisa-dotgov
           cf_space: stable
+          cf_manifest: "ops/manifests/manifest-stable.yaml"
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index fd2fbc9c5..fa4543637 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -31,10 +31,9 @@ jobs:
         run: docker compose run app python manage.py collectstatic --no-input
       - name: Deploy to cloud.gov sandbox
         uses: cloud-gov/cg-cli-tools@main
-        env:
-          MANIFEST: "ops/manifests/manifest-staging.yaml"
         with:
           cf_username: ${{ secrets.CF_STAGING_USERNAME }}
           cf_password: ${{ secrets.CF_STAGING_PASSWORD }}
           cf_org: cisa-dotgov
           cf_space: staging
+          cf_manifest: "ops/manifests/manifest-staging.yaml"