From 11da79b558d3e2a6eea437706bc281c3c54146a3 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Mon, 25 Apr 2022 10:14:24 -0400 Subject: [PATCH 01/11] 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 02/11] 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 03/11] 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 bd2a386303f5e7e4098e8b77dbb32b508c33814e Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Mon, 16 May 2022 10:26:14 -0400 Subject: [PATCH 04/11] Update transfer-rendered-files.yml --- .github/workflows/transfer-rendered-files.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/transfer-rendered-files.yml b/.github/workflows/transfer-rendered-files.yml index 82f96439..6f9c0dd8 100644 --- a/.github/workflows/transfer-rendered-files.yml +++ b/.github/workflows/transfer-rendered-files.yml @@ -35,7 +35,7 @@ jobs: file-quizzes-pr: name: File _Quizzes Transfer PR - runs-on: ubuntu-latest + runs-on: jhudsl/course_template needs: [yaml-check] if: ${{needs.yaml-check.outputs.toggle_coursera == 'yes' || needs.yaml-check.outputs.toggle_leanpub == 'yes'}} @@ -46,7 +46,6 @@ jobs: GH_PAT: ${{ secrets.GH_PAT }} run: | sudo apt-get install subversion - sudo Rscript -e "install.packages('optparse')" # What's the Quizzes repository's name? QUIZ_REPO=$(echo ${GITHUB_REPOSITORY} | sed "s/_Bookdown/ /g" | sed "s/_Template/ /g" | awk '{print $1"_Quizzes"}') From 33f5b2cd8e5f3d7d2b4c639dee8218d1fad87075 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Mon, 25 Apr 2022 10:15:28 -0400 Subject: [PATCH 05/11] 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() ``` From e125b3cd202d8568dea20143efc7a0dc448758f2 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Mon, 16 May 2022 10:49:14 -0400 Subject: [PATCH 06/11] Update to ottrpal:latest to test --- .github/workflows/transfer-rendered-files.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/transfer-rendered-files.yml b/.github/workflows/transfer-rendered-files.yml index 82f96439..3b6c4190 100644 --- a/.github/workflows/transfer-rendered-files.yml +++ b/.github/workflows/transfer-rendered-files.yml @@ -35,7 +35,7 @@ jobs: file-quizzes-pr: name: File _Quizzes Transfer PR - runs-on: ubuntu-latest + runs-on: ottrpal:latest needs: [yaml-check] if: ${{needs.yaml-check.outputs.toggle_coursera == 'yes' || needs.yaml-check.outputs.toggle_leanpub == 'yes'}} From ef67a7be4348fe44c0f679d4e73c73a000327052 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Mon, 16 May 2022 10:52:38 -0400 Subject: [PATCH 07/11] temporarily turn on leanpub --- config_automation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config_automation.yml b/config_automation.yml index b907b9b0..1660ecd4 100644 --- a/config_automation.yml +++ b/config_automation.yml @@ -16,8 +16,8 @@ docker-test: no ##### Renderings run upon merge to main branch ##### # Rendering each platform's content render-bookdown: yes -render-leanpub: no -render-coursera: no +render-leanpub: yes +render-coursera: yes # What docker image should be used for rendering? # The default is jhudsl/course_template:main From eb2dbdf6a165ebf88813bafb554de5d07775941f Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Mon, 16 May 2022 11:09:52 -0400 Subject: [PATCH 08/11] forgot the jhudsl/ part --- .github/workflows/transfer-rendered-files.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/transfer-rendered-files.yml b/.github/workflows/transfer-rendered-files.yml index 79a961da..22960c31 100644 --- a/.github/workflows/transfer-rendered-files.yml +++ b/.github/workflows/transfer-rendered-files.yml @@ -35,7 +35,7 @@ jobs: file-quizzes-pr: name: File _Quizzes Transfer PR - runs-on: ottrpal:latest + runs-on: jhudsl/ottrpal:latest needs: [yaml-check] if: ${{needs.yaml-check.outputs.toggle_coursera == 'yes' || needs.yaml-check.outputs.toggle_leanpub == 'yes'}} From 1aaad150f1088f5ca5d7fa2050bf5446f231e5a4 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Mon, 16 May 2022 11:15:06 -0400 Subject: [PATCH 09/11] Don't specify latest --- .github/workflows/transfer-rendered-files.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/transfer-rendered-files.yml b/.github/workflows/transfer-rendered-files.yml index 22960c31..218da938 100644 --- a/.github/workflows/transfer-rendered-files.yml +++ b/.github/workflows/transfer-rendered-files.yml @@ -35,7 +35,7 @@ jobs: file-quizzes-pr: name: File _Quizzes Transfer PR - runs-on: jhudsl/ottrpal:latest + runs-on: jhudsl/ottrpal needs: [yaml-check] if: ${{needs.yaml-check.outputs.toggle_coursera == 'yes' || needs.yaml-check.outputs.toggle_leanpub == 'yes'}} From 8d929ab7b02cac9f141fe461643b78508f9ddcb3 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Mon, 16 May 2022 11:18:04 -0400 Subject: [PATCH 10/11] Fix spec --- .github/workflows/transfer-rendered-files.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/transfer-rendered-files.yml b/.github/workflows/transfer-rendered-files.yml index 218da938..8a6d097b 100644 --- a/.github/workflows/transfer-rendered-files.yml +++ b/.github/workflows/transfer-rendered-files.yml @@ -35,7 +35,9 @@ jobs: file-quizzes-pr: name: File _Quizzes Transfer PR - runs-on: jhudsl/ottrpal + runs-on: ubuntu-latest + container: + image: jhudsl/ottrpal:latest needs: [yaml-check] if: ${{needs.yaml-check.outputs.toggle_coursera == 'yes' || needs.yaml-check.outputs.toggle_leanpub == 'yes'}} From 8bf4be68301d98fe26f28f0731b2010a7fbd9dc4 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Mon, 16 May 2022 11:23:50 -0400 Subject: [PATCH 11/11] Switch to main --- .github/workflows/transfer-rendered-files.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/transfer-rendered-files.yml b/.github/workflows/transfer-rendered-files.yml index 8a6d097b..a55fc4be 100644 --- a/.github/workflows/transfer-rendered-files.yml +++ b/.github/workflows/transfer-rendered-files.yml @@ -37,7 +37,7 @@ jobs: name: File _Quizzes Transfer PR runs-on: ubuntu-latest container: - image: jhudsl/ottrpal:latest + image: jhudsl/ottrpal:main needs: [yaml-check] if: ${{needs.yaml-check.outputs.toggle_coursera == 'yes' || needs.yaml-check.outputs.toggle_leanpub == 'yes'}}