From 8de4f22da9c1dbd4ac8d9c7a152fc65604518449 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Thu, 13 Jan 2022 08:53:29 -0500 Subject: [PATCH 1/5] Add git config to jhudsl-robot --- .github/workflows/delete-preview.yml | 5 +++++ .github/workflows/docker-build-test.yml | 5 +++++ .github/workflows/release-notes.yml | 5 +++++ .github/workflows/send-updates.yml | 5 +++++ .github/workflows/starting-course.yml | 8 ++++++-- .github/workflows/style-and-sp-check.yml | 7 +++++-- .github/workflows/test-send-updates.yml | 5 +++++ .github/workflows/transfer-rendered-files.yml | 5 +++++ .github/workflows/url-checker.yml | 7 ++++++- 9 files changed, 47 insertions(+), 5 deletions(-) diff --git a/.github/workflows/delete-preview.yml b/.github/workflows/delete-preview.yml index 419d2f4e..b539dbef 100644 --- a/.github/workflows/delete-preview.yml +++ b/.github/workflows/delete-preview.yml @@ -10,6 +10,11 @@ jobs: build-all: runs-on: ubuntu-latest steps: + - name: login as jhudsl-robot + run: | + git config --local user.email "itcrtrainingnetwork@gmail.com" + git config --local user.name "jhudsl-robot" + # This is because if a PR is closed before a render finishes it won't find it. - name: Sleep for 5 minutes run: sleep 300s diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index a96a1a0d..8652c9a5 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -32,6 +32,11 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: + - name: login as jhudsl-robot + run: | + git config --local user.email "itcrtrainingnetwork@gmail.com" + git config --local user.name "jhudsl-robot" + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index f962271c..8d7d49a6 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -11,6 +11,11 @@ jobs: pr-comment: runs-on: ubuntu-latest steps: + - name: login as jhudsl-robot + run: | + git config --local user.email "itcrtrainingnetwork@gmail.com" + git config --local user.name "jhudsl-robot" + - uses: mshick/add-pr-comment@v1 if: ${{ github.head_ref == 'repo-sync/OTTR_Template/default' }} with: diff --git a/.github/workflows/send-updates.yml b/.github/workflows/send-updates.yml index 6ccbe898..6deef20c 100644 --- a/.github/workflows/send-updates.yml +++ b/.github/workflows/send-updates.yml @@ -17,6 +17,11 @@ jobs: sync: runs-on: ubuntu-latest steps: + - name: login as jhudsl-robot + run: | + git config --local user.email "itcrtrainingnetwork@gmail.com" + git config --local user.name "jhudsl-robot" + - name: Checkout Repository uses: actions/checkout@master diff --git a/.github/workflows/starting-course.yml b/.github/workflows/starting-course.yml index 7926e23d..82335c66 100644 --- a/.github/workflows/starting-course.yml +++ b/.github/workflows/starting-course.yml @@ -15,7 +15,11 @@ jobs: runs-on: ubuntu-latest if: github.event.repository.name != 'OTTR_Template' steps: - + - name: login as jhudsl-robot + run: | + git config --local user.email "itcrtrainingnetwork@gmail.com" + git config --local user.name "jhudsl-robot" + # Check out current repository - name: Fetch current branch uses: actions/checkout@v2 @@ -94,7 +98,7 @@ jobs: resources/images/04-figures_files \ Course_Name.rds \ docs/*.html \ - docs/*.md + docs/*.md # Commit modified files - name: Commit deleted files diff --git a/.github/workflows/style-and-sp-check.yml b/.github/workflows/style-and-sp-check.yml index 002cbebf..db2d547a 100644 --- a/.github/workflows/style-and-sp-check.yml +++ b/.github/workflows/style-and-sp-check.yml @@ -20,6 +20,11 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: + - name: login as jhudsl-robot + run: | + git config --local user.email "itcrtrainingnetwork@gmail.com" + git config --local user.name "jhudsl-robot" + - uses: actions/checkout@v2 - name: Run spell check @@ -88,8 +93,6 @@ jobs: - name: Commit run: | - git config --local user.email "actions@github.com" - git config --local user.name "GitHub Actions" git add \*.Rmd git commit -m 'Style Rmds' || echo "No changes to commit" git push origin || echo "No changes to commit" diff --git a/.github/workflows/test-send-updates.yml b/.github/workflows/test-send-updates.yml index d3159efb..dded53c5 100644 --- a/.github/workflows/test-send-updates.yml +++ b/.github/workflows/test-send-updates.yml @@ -16,6 +16,11 @@ jobs: sync: runs-on: ubuntu-latest steps: + - name: login as jhudsl-robot + run: | + git config --local user.email "itcrtrainingnetwork@gmail.com" + git config --local user.name "jhudsl-robot" + - name: Checkout Repository uses: actions/checkout@master diff --git a/.github/workflows/transfer-rendered-files.yml b/.github/workflows/transfer-rendered-files.yml index 3bf592a0..d2e41de0 100644 --- a/.github/workflows/transfer-rendered-files.yml +++ b/.github/workflows/transfer-rendered-files.yml @@ -24,6 +24,11 @@ jobs: # Get repository name by dropping Bookdown if it exists but always append _Leanpub steps: + - name: login as jhudsl-robot + run: | + git config --local user.email "itcrtrainingnetwork@gmail.com" + git config --local user.name "jhudsl-robot" + - name: Run git repo check id: git_repo_check env: diff --git a/.github/workflows/url-checker.yml b/.github/workflows/url-checker.yml index 2d03a405..73d5e01d 100644 --- a/.github/workflows/url-checker.yml +++ b/.github/workflows/url-checker.yml @@ -15,8 +15,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: login as jhudsl-robot + run: | + git config --local user.email "itcrtrainingnetwork@gmail.com" + git config --local user.name "jhudsl-robot" + - uses: actions/checkout@v2 + - name: URLs-checker uses: urlstechie/urlchecker-action@master with: From e3a3dbf78d5d6dabcd6f8ea8ac1ce5a5a41f70d3 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Thu, 13 Jan 2022 09:05:02 -0500 Subject: [PATCH 2/5] rearrange so checkout comes first --- .github/workflows/delete-preview.yml | 5 ++++- .github/workflows/docker-build-test.yml | 6 +++--- .github/workflows/release-notes.yml | 2 +- .github/workflows/send-updates.yml | 6 +++--- .github/workflows/starting-course.yml | 7 +++---- .github/workflows/style-and-sp-check.yml | 5 +++-- .github/workflows/test-send-updates.yml | 6 +++--- .github/workflows/transfer-rendered-files.yml | 5 ----- .github/workflows/url-checker.yml | 5 +++-- 9 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.github/workflows/delete-preview.yml b/.github/workflows/delete-preview.yml index b539dbef..f49cf233 100644 --- a/.github/workflows/delete-preview.yml +++ b/.github/workflows/delete-preview.yml @@ -10,11 +10,14 @@ jobs: build-all: runs-on: ubuntu-latest steps: + - name: Checkout Repository + uses: actions/checkout@master + - name: login as jhudsl-robot run: | git config --local user.email "itcrtrainingnetwork@gmail.com" git config --local user.name "jhudsl-robot" - + # This is because if a PR is closed before a render finishes it won't find it. - name: Sleep for 5 minutes run: sleep 300s diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index 8652c9a5..e95d1b83 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -32,13 +32,13 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: + - name: Checkout Repository + uses: actions/checkout@master + - name: login as jhudsl-robot run: | git config --local user.email "itcrtrainingnetwork@gmail.com" git config --local user.name "jhudsl-robot" - - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - name: Don't re-test if this is a sync branch if: ${{ github.head_ref == 'repo-sync/OTTR_Template/default' }} diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 8d7d49a6..a1558585 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -15,7 +15,7 @@ jobs: run: | git config --local user.email "itcrtrainingnetwork@gmail.com" git config --local user.name "jhudsl-robot" - + - uses: mshick/add-pr-comment@v1 if: ${{ github.head_ref == 'repo-sync/OTTR_Template/default' }} with: diff --git a/.github/workflows/send-updates.yml b/.github/workflows/send-updates.yml index 6deef20c..85669e66 100644 --- a/.github/workflows/send-updates.yml +++ b/.github/workflows/send-updates.yml @@ -17,13 +17,13 @@ jobs: sync: runs-on: ubuntu-latest steps: + - name: Checkout Repository + uses: actions/checkout@master + - name: login as jhudsl-robot run: | git config --local user.email "itcrtrainingnetwork@gmail.com" git config --local user.name "jhudsl-robot" - - - name: Checkout Repository - uses: actions/checkout@master - name: Get the version id: get_tag diff --git a/.github/workflows/starting-course.yml b/.github/workflows/starting-course.yml index 82335c66..2ba37f27 100644 --- a/.github/workflows/starting-course.yml +++ b/.github/workflows/starting-course.yml @@ -15,14 +15,13 @@ jobs: runs-on: ubuntu-latest if: github.event.repository.name != 'OTTR_Template' steps: + - name: checkout repo + uses: actions/checkout@v2 + - name: login as jhudsl-robot run: | git config --local user.email "itcrtrainingnetwork@gmail.com" git config --local user.name "jhudsl-robot" - - # Check out current repository - - name: Fetch current branch - uses: actions/checkout@v2 ##### Filing issues! diff --git a/.github/workflows/style-and-sp-check.yml b/.github/workflows/style-and-sp-check.yml index db2d547a..61d540b6 100644 --- a/.github/workflows/style-and-sp-check.yml +++ b/.github/workflows/style-and-sp-check.yml @@ -20,13 +20,14 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: + - name: checkout repo + - uses: actions/checkout@v2 + - name: login as jhudsl-robot run: | git config --local user.email "itcrtrainingnetwork@gmail.com" git config --local user.name "jhudsl-robot" - - uses: actions/checkout@v2 - - name: Run spell check id: spell_check_run run: | diff --git a/.github/workflows/test-send-updates.yml b/.github/workflows/test-send-updates.yml index dded53c5..d02034bc 100644 --- a/.github/workflows/test-send-updates.yml +++ b/.github/workflows/test-send-updates.yml @@ -16,13 +16,13 @@ jobs: sync: runs-on: ubuntu-latest steps: + - name: Checkout Repository + uses: actions/checkout@master + - name: login as jhudsl-robot run: | git config --local user.email "itcrtrainingnetwork@gmail.com" git config --local user.name "jhudsl-robot" - - - name: Checkout Repository - uses: actions/checkout@master - name: Get the version id: get_tag diff --git a/.github/workflows/transfer-rendered-files.yml b/.github/workflows/transfer-rendered-files.yml index d2e41de0..3bf592a0 100644 --- a/.github/workflows/transfer-rendered-files.yml +++ b/.github/workflows/transfer-rendered-files.yml @@ -24,11 +24,6 @@ jobs: # Get repository name by dropping Bookdown if it exists but always append _Leanpub steps: - - name: login as jhudsl-robot - run: | - git config --local user.email "itcrtrainingnetwork@gmail.com" - git config --local user.name "jhudsl-robot" - - name: Run git repo check id: git_repo_check env: diff --git a/.github/workflows/url-checker.yml b/.github/workflows/url-checker.yml index 73d5e01d..1ad81e44 100644 --- a/.github/workflows/url-checker.yml +++ b/.github/workflows/url-checker.yml @@ -15,13 +15,14 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout Repository + uses: actions/checkout@master + - name: login as jhudsl-robot run: | git config --local user.email "itcrtrainingnetwork@gmail.com" git config --local user.name "jhudsl-robot" - - uses: actions/checkout@v2 - - name: URLs-checker uses: urlstechie/urlchecker-action@master with: From 374735b433ccd96620a6ce21dbbec1b7249399dd Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Thu, 13 Jan 2022 09:08:20 -0500 Subject: [PATCH 3/5] Make some updates --- .github/workflows/delete-preview.yml | 7 ------- .github/workflows/release-notes.yml | 5 ----- .github/workflows/style-and-sp-check.yml | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/delete-preview.yml b/.github/workflows/delete-preview.yml index f49cf233..b910ad45 100644 --- a/.github/workflows/delete-preview.yml +++ b/.github/workflows/delete-preview.yml @@ -10,13 +10,6 @@ jobs: build-all: runs-on: ubuntu-latest steps: - - name: Checkout Repository - uses: actions/checkout@master - - - name: login as jhudsl-robot - run: | - git config --local user.email "itcrtrainingnetwork@gmail.com" - git config --local user.name "jhudsl-robot" # This is because if a PR is closed before a render finishes it won't find it. - name: Sleep for 5 minutes diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index a1558585..f962271c 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -11,11 +11,6 @@ jobs: pr-comment: runs-on: ubuntu-latest steps: - - name: login as jhudsl-robot - run: | - git config --local user.email "itcrtrainingnetwork@gmail.com" - git config --local user.name "jhudsl-robot" - - uses: mshick/add-pr-comment@v1 if: ${{ github.head_ref == 'repo-sync/OTTR_Template/default' }} with: diff --git a/.github/workflows/style-and-sp-check.yml b/.github/workflows/style-and-sp-check.yml index 61d540b6..3abf00c1 100644 --- a/.github/workflows/style-and-sp-check.yml +++ b/.github/workflows/style-and-sp-check.yml @@ -21,7 +21,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - name: checkout repo - - uses: actions/checkout@v2 + uses: actions/checkout@v2 - name: login as jhudsl-robot run: | From b7d49048d503e5b91bf33f2347354ca920f3b8e3 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Thu, 13 Jan 2022 09:21:13 -0500 Subject: [PATCH 4/5] Add an "or equal to" --- .github/workflows/docker-build-test.yml | 6 +++--- .github/workflows/send-updates.yml | 3 +-- .github/workflows/style-and-sp-check.yml | 3 +-- .github/workflows/url-checker.yml | 6 +++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index e95d1b83..d22e887e 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -32,9 +32,9 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - name: Checkout Repository - uses: actions/checkout@master - + - name: checkout repo + uses: actions/checkout@v2 + - name: login as jhudsl-robot run: | git config --local user.email "itcrtrainingnetwork@gmail.com" diff --git a/.github/workflows/send-updates.yml b/.github/workflows/send-updates.yml index 85669e66..b00f77b3 100644 --- a/.github/workflows/send-updates.yml +++ b/.github/workflows/send-updates.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@master - + - name: login as jhudsl-robot run: | git config --local user.email "itcrtrainingnetwork@gmail.com" @@ -37,7 +37,6 @@ jobs: echo ::set-output name=version::${{ github.event.inputs.prtag }} fi - - name: Run Mechanics File Sync uses: BetaHuhn/repo-file-sync-action@v1.7.1 with: diff --git a/.github/workflows/style-and-sp-check.yml b/.github/workflows/style-and-sp-check.yml index 3abf00c1..d74c5627 100644 --- a/.github/workflows/style-and-sp-check.yml +++ b/.github/workflows/style-and-sp-check.yml @@ -41,7 +41,6 @@ jobs: name: spell-check-results path: spell_check_results.tsv - ############ The items if there's too many spelling errors! - name: Build components of the spell check comment id: build-components env: @@ -74,7 +73,7 @@ jobs: edit-mode: replace - name: Check spell check results - fail if too many errors - if: ${{ steps.spell_check_run.outputs.sp_chk_results > 3 }} + if: ${{ steps.spell_check_run.outputs.sp_chk_results >= 3 }} run: exit 1 - name: No spelling errors diff --git a/.github/workflows/url-checker.yml b/.github/workflows/url-checker.yml index 1ad81e44..fd3efdf6 100644 --- a/.github/workflows/url-checker.yml +++ b/.github/workflows/url-checker.yml @@ -15,9 +15,9 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout Repository - uses: actions/checkout@master - + - name: checkout repo + uses: actions/checkout@v2 + - name: login as jhudsl-robot run: | git config --local user.email "itcrtrainingnetwork@gmail.com" From 16e277eddbb3fe54cf311cda388dec61f1af8255 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Thu, 13 Jan 2022 09:23:25 -0500 Subject: [PATCH 5/5] Missed another >= --- .github/workflows/style-and-sp-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/style-and-sp-check.yml b/.github/workflows/style-and-sp-check.yml index d74c5627..9716ab42 100644 --- a/.github/workflows/style-and-sp-check.yml +++ b/.github/workflows/style-and-sp-check.yml @@ -60,7 +60,7 @@ jobs: body-includes: spelling errors - name: Spelling errors! - if: ${{ steps.spell_check_run.outputs.sp_chk_results > 3 }} + if: ${{ steps.spell_check_run.outputs.sp_chk_results >= 3 }} uses: peter-evans/create-or-update-comment@v1 with: comment-id: ${{ steps.fc.outputs.comment-id }}