Skip to content

Commit

Permalink
Rebase helps with render woes (#756)
Browse files Browse the repository at this point in the history
* Add rebase flag

* Update render-all.yml - add rebase flag

* Change to less nuclear solution
  • Loading branch information
avahoffman authored Jun 5, 2024
1 parent 2a35821 commit 11c4c12
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/render-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}}
Expand Down

0 comments on commit 11c4c12

Please sign in to comment.