Skip to content

Commit

Permalink
modified counting on conventional not using -c but 'grep -c .' becaus…
Browse files Browse the repository at this point in the history
…e it equals 1 even if no file was hit

modified $\{GITHUB_ACTOR\} with $\{\{github.event.pull_request.user.login\}\} in after-validate-submission.yaml
  • Loading branch information
kjsato committed Aug 28, 2024
1 parent 1679d4f commit b17de9d
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/after-validate-submission.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b17de9d

Please sign in to comment.