diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 677257201..369dbdef5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: - run: rustup override set ${{ env.RUST_VERSION }} - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2 - name: Install Zola - run: cargo install --locked --git https://github.com/getzola/zola --rev 45d3f8d6285f0b47013c5fa31eb405332118af8b + run: cargo install --locked --git https://github.com/getzola/zola --rev 29540e9897dbe8aca388b13f7bdf615985f6ca2c # v0.22.1 - run: zola build - run: cp CNAME ./public/ diff --git a/.github/workflows/snapshot_tests.yml b/.github/workflows/snapshot_tests.yml index 0e4334b3d..79e650112 100644 --- a/.github/workflows/snapshot_tests.yml +++ b/.github/workflows/snapshot_tests.yml @@ -15,7 +15,7 @@ jobs: - run: rustup override set ${{ env.RUST_VERSION }} - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2 - name: Install Zola - run: cargo install --locked --git https://github.com/getzola/zola --rev 45d3f8d6285f0b47013c5fa31eb405332118af8b + run: cargo install --locked --git https://github.com/getzola/zola --rev 29540e9897dbe8aca388b13f7bdf615985f6ca2c # v0.22.1 - run: git fetch --depth 2 - run: git checkout origin/main diff --git a/.gitignore b/.gitignore index d0cd697ad..0c609f989 100644 --- a/.gitignore +++ b/.gitignore @@ -8,10 +8,14 @@ /site /public -# generated by zola +# generated by zola < 0.22 (people might still have them lying around) /static/styles/syntax-theme-dark.css /static/styles/syntax-theme-light.css +# generated by zola >= 0.22 +/static/giallo-dark.css +/static/giallo-light.css + # these are old compiled sass files, people might still have them lying arouynd /static/styles/vendor.css /static/styles/app.css diff --git a/README.md b/README.md index afa8b7479..bb5a141a2 100644 --- a/README.md +++ b/README.md @@ -8,16 +8,16 @@ It uses [Zola](https://www.getzola.org/) and is deployed to GitHub Pages via Git ## Installing Zola -You need at least zola v0.21.0 to render the blog. +You need at least zola v0.22.0 to render the blog. Compile from source: ```sh -cargo install --debug --locked --git https://github.com/getzola/zola --rev 45d3f8d6285f0b47013c5fa31eb405332118af8b +cargo install --debug --locked --git https://github.com/getzola/zola --rev 29540e9897dbe8aca388b13f7bdf615985f6ca2c ``` You can also find a list of package managers that provide zola [here](https://www.getzola.org/documentation/getting-started/installation/). -Prebuilt binaries are available for download [here](https://github.com/getzola/zola/releases/tag/v0.21.0). +Prebuilt binaries are available for download [here](https://github.com/getzola/zola/releases/tag/v0.22.1). If you use [mise](https://mise.jdx.dev), you can run the pinned version of zola directly with `mise run zola`. ## Building diff --git a/config.toml b/config.toml index 76aeff886..4038d277b 100644 --- a/config.toml +++ b/config.toml @@ -7,15 +7,13 @@ feed_filenames = ["feed.xml", "releases.json"] build_search_index = false [markdown] -highlight_code = true -highlight_theme = "css" -highlight_themes_css = [ - { theme = "boron", filename = "styles/syntax-theme-dark.css" }, - { theme = "OneHalfLight", filename = "styles/syntax-theme-light.css" }, -] bottom_footnotes = true insert_anchor_links = "left" -extra_syntaxes_and_themes = ["syntaxes"] + +[markdown.highlighting] +light_theme = "light-plus" +dark_theme = "dark-plus" +style = "class" [extra] # Put all your custom variables here diff --git a/content/Rust-1.89.0.md b/content/Rust-1.89.0.md index 67599390b..2c761f194 100644 --- a/content/Rust-1.89.0.md +++ b/content/Rust-1.89.0.md @@ -61,7 +61,7 @@ fn items(scores: &[u8]) -> std::slice::Iter { Code like this will now produce a warning by default: -```text +```txt warning: hiding a lifetime that's elided elsewhere is confusing --> src/lib.rs:1:18 | @@ -215,4 +215,4 @@ Check out everything that changed in [Rust](https://github.com/rust-lang/rust/re Many people came together to create Rust 1.89.0. We couldn't have done it without all of you. [Thanks!](https://thanks.rust-lang.org/rust/1.89.0/) -[platform_support_page]: https://doc.rust-lang.org/rustc/platform-support.html \ No newline at end of file +[platform_support_page]: https://doc.rust-lang.org/rustc/platform-support.html diff --git a/mise.toml b/mise.toml index 5c1ae7b83..edd31a087 100644 --- a/mise.toml +++ b/mise.toml @@ -3,4 +3,4 @@ zola = "zola" serve = "zola serve --fast --open" [tools] -zola = "0.21.0" +zola = "0.22.1" diff --git a/syntaxes/custom_plain_text.sublime-syntax b/syntaxes/custom_plain_text.sublime-syntax deleted file mode 100644 index a82737ee0..000000000 --- a/syntaxes/custom_plain_text.sublime-syntax +++ /dev/null @@ -1,14 +0,0 @@ -%YAML 1.2 ---- -name: Plain Text -file_extensions: [text] -scope: text.plain - -# This custom syntax for plain text only exists so we can match against ```text -# code blocks, which are common in rustdoc. By default, only ```txt is supported -# by Zola. Without this file, `zola build` would print spurious warnings. - -contexts: - main: - - match: whatever - scope: text.plain