Update transfer-rendered-files.yml - specify docker image

.github/workflows/pull_request.yml

@@ -100,7 +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 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
@@ -210,8 +211,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 +299,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 +405,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

.github/workflows/transfer-rendered-files.yml

@@ -36,6 +36,8 @@ jobs:
   file-quizzes-pr:
     name: File _Quizzes Transfer PR
     runs-on: ubuntu-latest
+    container:
+      image: jhudsl/ottrpal:main
     needs: [yaml-check]
     if: ${{needs.yaml-check.outputs.toggle_coursera == 'yes' || needs.yaml-check.outputs.toggle_leanpub == 'yes'}}
 
@@ -46,7 +48,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"}')

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