From 11da79b558d3e2a6eea437706bc281c3c54146a3 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Mon, 25 Apr 2022 10:14:24 -0400 Subject: [PATCH 1/4] Try to update the git push --- .github/workflows/pull_request.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 600025ae..4a3ba66b 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -100,8 +100,8 @@ jobs: branch_name='preview-${{ github.event.pull_request.number }}' git add --force check_reports/spell_check_results.tsv || echo "No changes to commit" git commit -m 'Add spell check file' || echo "No changes to commit" - git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours - git push --force origin $branch_name || echo "No changes to commit" + git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=theirs + git push origin $branch_name || echo "No changes to commit" - name: Build components of the spell check comment id: build-components @@ -210,8 +210,7 @@ jobs: git add --force check_reports/url_checks.tsv || echo "No changes to commit" git commit -m 'Add URL check file' || echo "No changes to commit" git fetch - git merge -s recursive --strategy-option=theirs origin/${{ github.head_ref }} --allow-unrelated-histories - git push --force origin $branch_name || echo "No changes to commit" + git push origin $branch_name || echo "No changes to commit" - name: Build components of the spell check comment id: build-components @@ -299,7 +298,7 @@ jobs: branch_name='preview-${{ github.event.pull_request.number }}' git add --force question_error_report.tsv || echo "No changes to commit" git commit -m 'Add question error report file' || echo "No changes to commit" - git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours + git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=theirs git push origin $branch_name || echo "No changes to commit" - name: Build components of the quiz check comment @@ -405,8 +404,8 @@ jobs: echo ::set-output name=changes::$changes git add . --force git commit -m 'Render preview' || echo "No changes to commit" - git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours - git push --force || echo "No changes to commit" + git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=theirs + git push origin $branch_name || echo "No changes to commit" shell: bash - name: Find Comment From b4b49e680e07af6d15569634e456796d64e9f6f7 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Mon, 25 Apr 2022 10:15:28 -0400 Subject: [PATCH 2/4] Add broken urls and spelling errors --- 02-chapter_of_course.Rmd | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/02-chapter_of_course.Rmd b/02-chapter_of_course.Rmd index dc240d2f..1b9d0969 100644 --- a/02-chapter_of_course.Rmd +++ b/02-chapter_of_course.Rmd @@ -153,6 +153,15 @@ Here's more words that are hidden. You should print out session info when you have code for [reproducibility purposes](https://jhudatascience.org/Reproducibility_in_Cancer_Informatics/managing-package-versions.html). + +http://aiubhesiugbaw.com +http://aishdiugbsbguisbibsi.com + + +abuisbgbwieb +abiebfiuawebfiuaw +abwuiebgw + ```{r} devtools::session_info() ``` From dcd09ce654819055b1041d62686de6f2da8ba602 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Tue, 10 May 2022 14:46:55 -0400 Subject: [PATCH 3/4] This appears to work better --- .github/workflows/pull_request.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 4a3ba66b..a6729dbe 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -100,8 +100,9 @@ jobs: branch_name='preview-${{ github.event.pull_request.number }}' git add --force check_reports/spell_check_results.tsv || echo "No changes to commit" git commit -m 'Add spell check file' || echo "No changes to commit" - git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=theirs - git push origin $branch_name || echo "No changes to commit" + git fetch + git merge -s recursive --strategy-option=theirs origin/${{ github.head_ref }} --allow-unrelated-histories + git push --force origin $branch_name || echo "No changes to commit" - name: Build components of the spell check comment id: build-components From 33f5b2cd8e5f3d7d2b4c639dee8218d1fad87075 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Mon, 25 Apr 2022 10:15:28 -0400 Subject: [PATCH 4/4] Revert "Add broken urls and spelling errors" This reverts commit b4b49e680e07af6d15569634e456796d64e9f6f7. --- 02-chapter_of_course.Rmd | 9 --------- 1 file changed, 9 deletions(-) diff --git a/02-chapter_of_course.Rmd b/02-chapter_of_course.Rmd index 1b9d0969..dc240d2f 100644 --- a/02-chapter_of_course.Rmd +++ b/02-chapter_of_course.Rmd @@ -153,15 +153,6 @@ Here's more words that are hidden. You should print out session info when you have code for [reproducibility purposes](https://jhudatascience.org/Reproducibility_in_Cancer_Informatics/managing-package-versions.html). - -http://aiubhesiugbaw.com -http://aishdiugbsbguisbibsi.com - - -abuisbgbwieb -abiebfiuawebfiuaw -abwuiebgw - ```{r} devtools::session_info() ```