From 070a2462b346a2165f32e1ea78bc8b7d71960da1 Mon Sep 17 00:00:00 2001 From: cansavvy Date: Wed, 5 Jun 2024 20:11:54 +0000 Subject: [PATCH 1/7] =?UTF-8?q?=F0=9F=94=84=20Synced=20local=20'.github/wo?= =?UTF-8?q?rkflows/'=20with=20remote=20'.github/workflows/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit test-run --- .github/workflows/render-all.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml index a93ce19..ffcaa64 100644 --- a/.github/workflows/render-all.yml +++ b/.github/workflows/render-all.yml @@ -83,7 +83,7 @@ jobs: git fetch origin git add --force docs/* git commit -m 'Render bookdown' || echo "No changes to commit" - git pull --rebase --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours + git pull --rebase --allow-unrelated-histories --strategy-option=ours git push -u origin main || echo "No changes to push" render-tocless: @@ -122,7 +122,7 @@ jobs: git fetch origin git add --force docs/no_toc* git commit -m 'Render toc-less' || echo "No changes to commit" - git pull --rebase --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours + git pull --rebase --allow-unrelated-histories --strategy-option=ours git push -u origin main || echo "No changes to push" render-leanpub: @@ -199,7 +199,7 @@ jobs: git add --force resources/* git add --force docs/* git commit -m 'Render Leanpub' || echo "No changes to commit" - git pull --rebase --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours + git pull --rebase --allow-unrelated-histories --strategy-option=ours git push --force --set-upstream origin main || echo "No changes to push" render-coursera: @@ -244,5 +244,5 @@ jobs: git add --force resources/* git add --force docs/* git commit -m 'Render Coursera quizzes' || echo "No changes to commit" - git pull --rebase --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours + git pull --rebase --allow-unrelated-histories --strategy-option=ours git push -u origin main || echo "No changes to push" From b835add9af20f1b4c3ee0707f071744115d4b6c6 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Wed, 5 Jun 2024 16:18:22 -0400 Subject: [PATCH 2/7] Update render-all.yml --- .github/workflows/render-all.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml index ffcaa64..8569e24 100644 --- a/.github/workflows/render-all.yml +++ b/.github/workflows/render-all.yml @@ -83,7 +83,6 @@ jobs: git fetch origin git add --force docs/* git commit -m 'Render bookdown' || echo "No changes to commit" - git pull --rebase --allow-unrelated-histories --strategy-option=ours git push -u origin main || echo "No changes to push" render-tocless: From c8247b49cdd9be468f87b02ed397c89febb67058 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Wed, 5 Jun 2024 16:22:01 -0400 Subject: [PATCH 3/7] Update render-all.yml --- .github/workflows/render-all.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml index 8569e24..8861415 100644 --- a/.github/workflows/render-all.yml +++ b/.github/workflows/render-all.yml @@ -83,6 +83,7 @@ jobs: git fetch origin git add --force docs/* git commit -m 'Render bookdown' || echo "No changes to commit" + git pull --allow-unrelated-histories --strategy-option=ours git push -u origin main || echo "No changes to push" render-tocless: From 47f413ca98a72e1304d266367ac848defb690410 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Wed, 5 Jun 2024 16:34:02 -0400 Subject: [PATCH 4/7] Update render-all.yml --- .github/workflows/render-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml index 8861415..7aa8ecd 100644 --- a/.github/workflows/render-all.yml +++ b/.github/workflows/render-all.yml @@ -122,7 +122,7 @@ jobs: git fetch origin git add --force docs/no_toc* git commit -m 'Render toc-less' || echo "No changes to commit" - git pull --rebase --allow-unrelated-histories --strategy-option=ours + git pull --allow-unrelated-histories --strategy-option=ours git push -u origin main || echo "No changes to push" render-leanpub: From ccdce14fa7f942061df3facfe1149c4f2415ab51 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Thu, 6 Jun 2024 08:10:30 -0400 Subject: [PATCH 5/7] leanpub logic bug --- .github/workflows/render-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml index 7aa8ecd..770444c 100644 --- a/.github/workflows/render-all.yml +++ b/.github/workflows/render-all.yml @@ -173,7 +173,7 @@ jobs: git push -u origin main || echo "No changes to push" - name: Run ottrpal::bookdown_to_embed_leanpub - if: needs.yaml-check.outputs.toggle_quiz_check == 'no' + if: ${{ needs.yaml-check.outputs.toggle_quiz_check == 'no'}} run: | Rscript -e "ottrpal::bookdown_to_embed_leanpub( render = FALSE, \ @@ -182,7 +182,7 @@ jobs: quiz_dir = NULL)" - name: Run ottrpal::bookdown_to_embed_leanpub - if: needs.yaml-check.outputs.toggle_quiz_check == 'yes' + if: ${{ needs.yaml-check.outputs.toggle_quiz_check == 'yes'}} run: | Rscript -e "ottrpal::bookdown_to_embed_leanpub( render = FALSE, \ From e70adeb014c68664573ded52ea741c54221ae8dc Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Thu, 6 Jun 2024 08:17:00 -0400 Subject: [PATCH 6/7] Update render-all.yml --- .github/workflows/render-all.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml index 770444c..9f9c64e 100644 --- a/.github/workflows/render-all.yml +++ b/.github/workflows/render-all.yml @@ -171,6 +171,8 @@ jobs: git commit -m 'Delete manuscript folder' || echo "No changes to commit" git pull --rebase --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours git push -u origin main || echo "No changes to push" + echo ${{ needs.yaml-check.outputs.toggle_quiz_check == 'yes'}} + echo ${{needs.yaml-check.outputs.toggle_quiz_check}} - name: Run ottrpal::bookdown_to_embed_leanpub if: ${{ needs.yaml-check.outputs.toggle_quiz_check == 'no'}} From d0b831aa352ad2a394866c951e8201436f3174ef Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Thu, 6 Jun 2024 08:25:14 -0400 Subject: [PATCH 7/7] Update render-all.yml --- .github/workflows/render-all.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml index 9f9c64e..a895df4 100644 --- a/.github/workflows/render-all.yml +++ b/.github/workflows/render-all.yml @@ -127,7 +127,7 @@ jobs: render-leanpub: name: Finish Leanpub prep - needs: [render-tocless] + needs: [yaml-check, render-tocless] runs-on: ubuntu-latest container: image: jhudsl/ottrpal:main @@ -171,8 +171,6 @@ jobs: git commit -m 'Delete manuscript folder' || echo "No changes to commit" git pull --rebase --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours git push -u origin main || echo "No changes to push" - echo ${{ needs.yaml-check.outputs.toggle_quiz_check == 'yes'}} - echo ${{needs.yaml-check.outputs.toggle_quiz_check}} - name: Run ottrpal::bookdown_to_embed_leanpub if: ${{ needs.yaml-check.outputs.toggle_quiz_check == 'no'}} @@ -206,7 +204,7 @@ jobs: render-coursera: name: Finish Coursera prep - needs: [render-tocless] + needs: [yaml-check, render-tocless] runs-on: ubuntu-latest container: image: ${{needs.yaml-check.outputs.rendering_docker_image}}