From 0394f6c914775f95d1b48d180b7cf8ef0ea8fd7a Mon Sep 17 00:00:00 2001
From: Koji SATO <38393480+kjsato@users.noreply.github.com>
Date: Wed, 28 Aug 2024 15:59:49 -0400
Subject: [PATCH] =?UTF-8?q?Revert=20"modified=20counting=20on=20convention?=
 =?UTF-8?q?al=20not=20using=20-c=20but=20'grep=20-c=20.'=20becaus=E2=80=A6?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/after-validate-submission.yaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/after-validate-submission.yaml b/.github/workflows/after-validate-submission.yaml
index 4fc29f2b..75c5877e 100644
--- a/.github/workflows/after-validate-submission.yaml
+++ b/.github/workflows/after-validate-submission.yaml
@@ -81,7 +81,7 @@ jobs:
         id: check_files
         run: |
           echo 'retro='$(echo '${{ steps.changed-files.outputs.added_files }} ${{ steps.changed-files.outputs.modified_files }}' | tr ' ' '\n' | grep 'model-output' | grep '.*-RETRO.*\.\(csv\|parquet\)'| grep -v '\.github/') >> $GITHUB_ENV
-          echo 'conventional='$(echo '${{ steps.changed-files.outputs.added_files }} ${{ steps.changed-files.outputs.modified_files }}' | tr ' ' '\n' | grep -v '\.github/' | grep -v '.*-RETRO.*\.\(csv\|parquet\)' | grep -c .) >> $GITHUB_ENV
+          echo 'conventional='$(echo '${{ steps.changed-files.outputs.added_files }} ${{ steps.changed-files.outputs.modified_files }}' | tr ' ' '\n' | grep -v '\.github/' | grep -c -v '.*-RETRO.*\.\(csv\|parquet\)') >> $GITHUB_ENV
       - name: Run R script
         run: |
           cd ./scripts
@@ -102,8 +102,7 @@ jobs:
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           if [ -n "$(git status --porcelain)" ]; then
             git add model-output/hub-ensemble/*
-            git commit -m "Upload new files to RSV data repo by ${{ github.event
-.pull_request.user.login }} in #${{ github.event.pull_request.number }}"
+            git commit -m "Upload new files to RSV data repo by ${GITHUB_ACTOR} in #${{ github.event.pull_request.number }}"
             git push
             echo "Data for hub-ensemble uploaded to root repo";
           else
@@ -137,8 +136,7 @@ jobs:
           git pull origin main
           if [ -n "$(git status --porcelain)" ]; then
             git add .
-            git commit -m "Upload new files to RSV data repo by ${{ github.event
-.pull_request.user.login }} in #${{ github.event.pull_request.number }}"
+            git commit -m "Upload new files to RSV data repo by ${GITHUB_ACTOR} in #${{ github.event.pull_request.number }}"
             git push
             echo "RSV data uploaded";
           else