From 1bd936205c8ef50e550d1ffa57e18fc966e15009 Mon Sep 17 00:00:00 2001
From: Adam Buckingham <AJBuckingham7@gmail.com>
Date: Fri, 15 Nov 2024 08:41:34 -0500
Subject: [PATCH] Removing citizen-of-planet-earth/cf-cli-action@master

---
 .github/workflows/deploy.yml | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1e10bdaa..b1ab2d1c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -52,12 +52,25 @@ jobs:
         name: Checkout
         uses: actions/checkout@v3.5.3          
       -
-        name: Push to Cloud.gov Dev Space
-        uses: citizen-of-planet-earth/cf-cli-action@master
-        with:
-          cf_api: https://api.fr.cloud.gov
-          cf_username: ${{ secrets.CF_USER }}
-          cf_password: ${{ secrets.CF_PASSWORD }}
-          cf_org: gsa-ogp-srt
-          cf_space: dev
-          command: push srt-ui-dev -f cf/manifest.dev.yml --docker-image ${{ secrets.DOCKERHUB_USERNAME }}/srt-ui:dev-${{ needs.docker.outputs.formattedTime }}
+        name: Update Cloud Foundry Public Key and Repository
+        run: |
+          wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo gpg --dearmor -o /usr/share/keyrings/cli.cloudfoundry.org.gpg
+          echo "deb [signed-by=/usr/share/keyrings/cli.cloudfoundry.org.gpg] https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
+          sudo apt-get update
+      -
+        name: Install Cloud Foundry CLI
+        run: sudo apt-get install -y cf8-cli
+      -
+        name: Cloud Foundry Login
+        env:
+          CF_API: https://api.fr.cloud.gov
+          CF_USERNAME: ${{ secrets.CF_USER }}
+          CF_PASSWORD: ${{ secrets.CF_PASSWORD }}
+          CF_ORG: gsa-ogp-srt
+          CF_SPACE: dev
+        run: cf login -a $CF_API -u $CF_USERNAME -p $CF_PASSWORD -o $CF_ORG -s $CF_SPACE
+      -
+        name: Cloud Foundry Push
+        env:
+          DOCKER_IMAGE: ${{ secrets.DOCKERHUB_USERNAME }}/srt-fbo-scraper:dev-${{ needs.docker.outputs.formattedTime }}
+        run: cf push srt-fbo-scraper-dev -f cf/manifest.dev.yml --docker-image $DOCKER_IMAGE