From cf1e6aa9b791a8bd8f811c85dbc85b558f387d2b Mon Sep 17 00:00:00 2001
From: Matt-Spence <matthewswSpence@gmail.com>
Date: Wed, 30 Oct 2024 16:55:38 -0500
Subject: [PATCH 1/2] Update clone-staging.yaml

---
 .github/workflows/clone-staging.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml
index 6466c7def..fbd55b6ee 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -40,7 +40,7 @@ jobs:
           cf_password: ${{ secrets.CF_MS_PASSWORD }}
           cf_org: cisa-dotgov
           cf_space: ${{ env.SOURCE_ENVIRONMENT }}
-          command: cg-manage-rds clone getgov-${{ env.SOURCE_ENVIRONMENT }}-database getgov-${{ env.DESTINATION_ENVIRONMENT }}-database
+          command: pip install git+https://github.com/cloud-gov/cg-manage-rds.git && cg-manage-rds clone getgov-${{ env.SOURCE_ENVIRONMENT }}-database getgov-${{ env.DESTINATION_ENVIRONMENT }}-database
       
       - name: Unshare DB Service
         uses: cloud-gov/cg-cli-tools@main

From 4e3569d73d31d40fbf3a35172f36db2b9e60dc31 Mon Sep 17 00:00:00 2001
From: Matt-Spence <matthewswSpence@gmail.com>
Date: Thu, 31 Oct 2024 10:28:39 -0500
Subject: [PATCH 2/2] Add tools and minor updates to cloning workflow

---
 .github/workflows/clone-staging.yaml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml
index fbd55b6ee..df943f138 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -22,7 +22,16 @@ jobs:
       CF_PASSWORD: CF_MS_PASSWORD
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+          cache: 'pip' # caching pip dependencies
+          
+      - name: Install CG Tool
+        run: pip install git+https://github.com/cloud-gov/cg-manage-rds.git
 
       - name: Share DB Service
         uses: cloud-gov/cg-cli-tools@main
@@ -40,7 +49,7 @@ jobs:
           cf_password: ${{ secrets.CF_MS_PASSWORD }}
           cf_org: cisa-dotgov
           cf_space: ${{ env.SOURCE_ENVIRONMENT }}
-          command: pip install git+https://github.com/cloud-gov/cg-manage-rds.git && cg-manage-rds clone getgov-${{ env.SOURCE_ENVIRONMENT }}-database getgov-${{ env.DESTINATION_ENVIRONMENT }}-database
+          command: cg-manage-rds clone getgov-${{ env.SOURCE_ENVIRONMENT }}-database getgov-${{ env.DESTINATION_ENVIRONMENT }}-database
       
       - name: Unshare DB Service
         uses: cloud-gov/cg-cli-tools@main