From 9f69a65ced706bf72398f554bedb9bcd8d5ce234 Mon Sep 17 00:00:00 2001
From: Rusty Deaton <rdeaton@radiantlogic.com>
Date: Tue, 19 Nov 2024 23:45:53 -0500
Subject: [PATCH] ggggggggggggggggggggggggg

gggggggggggggggggggggg
---
 .github/workflows/dockertest.yml | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/dockertest.yml b/.github/workflows/dockertest.yml
index a2276b4..9bb6758 100644
--- a/.github/workflows/dockertest.yml
+++ b/.github/workflows/dockertest.yml
@@ -152,11 +152,12 @@ jobs:
       -
         name: Access cloned repository content
         run: |
-          cp "./${{ env.OUTPUT_NAME }}.csv" "./${{ env.REPORTING_REPO }}/${{ github.workspace }}/${{ env.OUTPUT_NAME }}.csv"
+          cp "./${{ env.OUTPUT_NAME }}.csv" "./${{ env.REPORTING_REPO }}/${{ github.event.repository.name }}/${{ env.OUTPUT_NAME }}.csv"
+          cd ./${{ env.REPORTING_REPO }}/${{ github.event.repository.name }}
           git config --global user.email ${{ secrets.GH_EMAIL }}
           git config --global user.name ${{ secrets.GH_NAME }}
-          git add "${{ github.workspace }}/${{ env.OUTPUT_NAME }}.csv"
-          git commit -m "Update ${{ env.TOOL }} results"
+          git add "${{ env.OUTPUT_NAME }}.csv"
+          git commit -m "Update ${{ env.TOOL }} results in ${{ github.event.repository.name }}"
       -
         name: Push to Reporting Repo
         run: |
@@ -242,12 +243,12 @@ jobs:
       -
         name: Access cloned repository content
         run: |
-          cp "./${{ env.OUTPUT_NAME }}.csv" "./${{ env.REPORTING_REPO }}/${{ env.OUTPUT_NAME }}.csv"
-          cd ./${{ env.REPORTING_REPO }}
+          cp "./${{ env.OUTPUT_NAME }}.csv" "./${{ env.REPORTING_REPO }}/${{ github.event.repository.name }}/${{ env.OUTPUT_NAME }}.csv"
+          cd ./${{ env.REPORTING_REPO }}/${{ github.event.repository.name }}
           git config --global user.email ${{ secrets.GH_EMAIL }}
           git config --global user.name ${{ secrets.GH_NAME }}
           git add "${{ env.OUTPUT_NAME }}.csv"
-          git commit -m "Update ${{ env.TOOL }} results"
+          git commit -m "Update ${{ env.TOOL }} results in ${{ github.event.repository.name }}"
       -
         name: Push to Reporting Repo
         run: |
@@ -314,10 +315,6 @@ jobs:
             ${{ env.OUTPUT_NAME }}.json
             ${{ env.OUTPUT_NAME }}.hdf.json
             ${{ env.OUTPUT_NAME }}.csv
-      #-
-      #  name: Upload to S3
-      #  run: |
-      #    aws s3 cp ./grype-results.csv s3://grafana-flow-testing/
       -
         name: Clone Reporting Repo
         uses: GuillaumeFalourd/clone-github-repo-action@v2.3
@@ -330,7 +327,6 @@ jobs:
       -
         name: Access cloned repository content
         run: |
-          ls -latr ./${{ env.REPORTING_REPO }}/${{ github.event.repository.name }}/
           cp "./${{ env.OUTPUT_NAME }}.csv" "./${{ env.REPORTING_REPO }}/${{ github.event.repository.name }}/${{ env.OUTPUT_NAME }}.csv"
           cd ./${{ env.REPORTING_REPO }}/${{ github.event.repository.name }}
           git config --global user.email ${{ secrets.GH_EMAIL }}
@@ -527,13 +523,12 @@ jobs:
       -
         name: Access cloned repository content
         run: |
-          cp "./${{ env.OUTPUT_NAME }}.csv" "./${{ env.REPORTING_REPO }}/${{ env.OUTPUT_NAME }}.csv"
-          cd ./${{ env.REPORTING_REPO }}
-          ls -latr
+          cp "./${{ env.OUTPUT_NAME }}.csv" "./${{ env.REPORTING_REPO }}/${{ github.event.repository.name }}/${{ env.OUTPUT_NAME }}.csv"
+          cd ./${{ env.REPORTING_REPO }}/${{ github.event.repository.name }}
           git config --global user.email ${{ secrets.GH_EMAIL }}
           git config --global user.name ${{ secrets.GH_NAME }}
           git add "${{ env.OUTPUT_NAME }}.csv"
-          git commit -m "Update ${{ env.TOOL }} results"
+          git commit -m "Update ${{ env.TOOL }} results in ${{ github.event.repository.name }}"
       -
         name: Push to Reporting Repo
         run: |
@@ -615,13 +610,12 @@ jobs:
       -
         name: Access cloned repository content
         run: |
-          cp "./${{ env.OUTPUT_NAME }}.csv" "./${{ env.REPORTING_REPO }}/${{ env.OUTPUT_NAME }}.csv"
-          cd ./${{ env.REPORTING_REPO }}
-          ls -latr
+          cp "./${{ env.OUTPUT_NAME }}.csv" "./${{ env.REPORTING_REPO }}/${{ github.event.repository.name }}/${{ env.OUTPUT_NAME }}.csv"
+          cd ./${{ env.REPORTING_REPO }}/${{ github.event.repository.name }}
           git config --global user.email ${{ secrets.GH_EMAIL }}
           git config --global user.name ${{ secrets.GH_NAME }}
           git add "${{ env.OUTPUT_NAME }}.csv"
-          git commit -m "Update ${{ env.TOOL }} results"
+          git commit -m "Update ${{ env.TOOL }} results in ${{ github.event.repository.name }}"
       -
         name: Push to Reporting Repo
         run: |