Skip to content

Commit 4c83fe0

Browse files
committed
Merge branch 'haita'
2 parents 03a8aa2 + 1527641 commit 4c83fe0

17 files changed

Lines changed: 105 additions & 1713 deletions

File tree

.github/workflows/gh-pages.yml

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,38 @@ concurrency:
1414
cancel-in-progress: false
1515

1616
jobs:
17-
deploy:
18-
name: Deploy GitHub Pages
17+
build-docs:
18+
name: Build Haita Book
1919
runs-on: ubuntu-latest
20-
environment:
21-
name: github-pages
22-
url: ${{ steps.deployment.outputs.page_url }}
2320
steps:
2421
- name: Checkout
25-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2623
with:
2724
fetch-depth: 0
28-
- name: Install Shiroa
29-
uses: typst-community/setup-shiroa@v1
25+
- name: Install just and pagefind
26+
uses: taiki-e/install-action@v2
3027
with:
31-
shiroa-version: 0.3.1-rc3
28+
tool: just,pagefind
29+
- name: Setup typst
30+
id: setup-typst
31+
uses: typst-community/setup-typst@v5
3232
- name: Build Book
33-
run: shiroa build --mode static-html --path-to-root /${{github.event.repository.name}}/ -w . docs/book
33+
run: just book
34+
- name: Upload Pages artifact
35+
uses: actions/upload-pages-artifact@v5
36+
with:
37+
path: docs/book/dist
38+
39+
deploy:
40+
name: Deploy GitHub Pages
41+
needs: build-docs
42+
runs-on: ubuntu-latest
43+
environment:
44+
name: github-pages
45+
url: ${{ steps.deployment.outputs.page_url }}
46+
steps:
3447
- name: Setup Pages
3548
uses: actions/configure-pages@v5
36-
- name: Upload artifact
37-
uses: actions/upload-pages-artifact@v3
38-
with:
39-
path: 'docs/book/dist'
4049
- name: Deploy to GitHub Pages
4150
id: deployment
42-
uses: actions/deploy-pages@v4
51+
uses: actions/deploy-pages@v5

Justfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,13 @@ doc:
2525
typst c gallery/test.typ
2626
rm -r gallery/assets/
2727

28-
# preview the book locally
28+
# build the book
29+
book:
30+
typst compile --root . --features bundle,html --format bundle docs/book/dist.typ
31+
pagefind --site docs/book/dist --output-subdir pagefind
32+
2933
serve-book:
30-
shiroa serve --mode static-html -w . docs/book/
34+
typst watch --root . --features bundle,html --format bundle docs/book/dist.typ
3135

3236
# run test suite
3337
test *args:

docs/book/book.typ

Lines changed: 0 additions & 35 deletions
This file was deleted.

docs/book/contrib/typst/gh-pages.typ

Lines changed: 0 additions & 272 deletions
This file was deleted.

0 commit comments

Comments
 (0)