diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index d81d7802..2e122ba7 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -172,7 +172,7 @@ jobs: echo "changes=$changes" >> $GITHUB_OUTPUT 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 pull --rebase --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours git push --force || echo "No changes to commit" shell: bash diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml index 12643d87..ad299a07 100644 --- a/.github/workflows/render-all.yml +++ b/.github/workflows/render-all.yml @@ -88,7 +88,7 @@ jobs: render-tocless: name: Render TOC-less version for Leanpub or Coursera - needs: [yaml-check] + needs: [render-bookdown] runs-on: ubuntu-latest container: image: ${{needs.yaml-check.outputs.rendering_docker_image}} @@ -127,7 +127,7 @@ jobs: render-leanpub: name: Finish Leanpub prep - needs: [yaml-check, render-tocless] + needs: [render-tocless] runs-on: ubuntu-latest container: image: jhudsl/ottrpal:main @@ -204,7 +204,7 @@ jobs: render-coursera: name: Finish Coursera prep - needs: [yaml-check, render-tocless] + needs: [render-tocless] runs-on: ubuntu-latest container: image: ${{needs.yaml-check.outputs.rendering_docker_image}}