From b17de9d7f0b382bcd9ec2adc300ec18f623d33e1 Mon Sep 17 00:00:00 2001
From: kjsato <koz.sato@gmail.com>
Date: Wed, 28 Aug 2024 15:53:21 -0400
Subject: [PATCH] modified counting on conventional not using -c but 'grep -c
 .' because it equals 1 even if no file was hit modified $\{GITHUB_ACTOR\}
 with $\{\{github.event.pull_request.user.login\}\} in
 after-validate-submission.yaml

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

diff --git a/.github/workflows/after-validate-submission.yaml b/.github/workflows/after-validate-submission.yaml
index 75c5877e..4fc29f2b 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 -c -v '.*-RETRO.*\.\(csv\|parquet\)') >> $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
       - name: Run R script
         run: |
           cd ./scripts
@@ -102,7 +102,8 @@ 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_ACTOR} in #${{ github.event.pull_request.number }}"
+            git commit -m "Upload new files to RSV data repo by ${{ github.event
+.pull_request.user.login }} in #${{ github.event.pull_request.number }}"
             git push
             echo "Data for hub-ensemble uploaded to root repo";
           else
@@ -136,7 +137,8 @@ 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_ACTOR} in #${{ github.event.pull_request.number }}"
+            git commit -m "Upload new files to RSV data repo by ${{ github.event
+.pull_request.user.login }} in #${{ github.event.pull_request.number }}"
             git push
             echo "RSV data uploaded";
           else