diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml index c0fd21804..4a4ee9b9e 100644 --- a/.github/workflows/build-docs.yaml +++ b/.github/workflows/build-docs.yaml @@ -45,12 +45,6 @@ jobs: cd docs make quartodoc - - name: Build site - if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'merge_group' || startsWith(github.head_ref, 'docs') }} - run: | - cd docs - make site - # ===================================================== # Shinylive # ===================================================== @@ -62,12 +56,13 @@ jobs: ref: main path: shinylive-repo - - name: Update shinylive's copy of shiny, htmltools, and other packages + - name: Update shinylive's copy of shiny and htmltools if: github.ref == 'refs/heads/main' run: | cd shinylive-repo make submodules - make submodules-pull + make submodules-pull-shiny + make submodules-pull-htmltools - name: Build shinylive if: github.ref == 'refs/heads/main' @@ -75,6 +70,18 @@ jobs: cd shinylive-repo make all + # TODO-future; Install updated shinylive assets via updated py-shinylive pkg + + # ===================================================== + # Build site + # ===================================================== + + - name: Build site + if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'merge_group' || startsWith(github.head_ref, 'docs') }} + run: | + cd docs + make site + # ===================================================== # Deploy # =====================================================