diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index d751358143..399d4674cb 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -19,11 +19,11 @@ jobs: - name: Build CSS run: npx @tailwindcss/cli -m -i input.css -o static/main.css - name: Download Zola - run: curl -fsSL https://github.com/getzola/zola/releases/download/v0.20.0/zola-v0.20.0-x86_64-unknown-linux-gnu.tar.gz | tar xz + run: curl -fsSL https://github.com/getzola/zola/releases/download/v0.22.1/zola-v0.22.1-x86_64-unknown-linux-gnu.tar.gz | tar xz - name: Build site run: ./zola build - name: Upload static files as artifact - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v4 with: path: website/public/ diff --git a/release-hook.sh b/release-hook.sh index 4934933793..0e955d1f79 100755 --- a/release-hook.sh +++ b/release-hook.sh @@ -4,7 +4,6 @@ set -e typos -cargo upgrades # Similar to CI cargo clippy -- --deny warnings diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs index c71199142a..91d0536e1e 100644 --- a/tests/integration_tests.rs +++ b/tests/integration_tests.rs @@ -1,5 +1,4 @@ use std::{ - env::{self, consts::EXE_SUFFIX}, process::{Command, Stdio}, str::from_utf8, }; @@ -40,20 +39,7 @@ impl<'a> Cmd<'a> { #[track_caller] fn assert(&self, success: bool) { - let rustlings_bin = { - let mut path = env::current_exe().unwrap(); - // Pop test binary name - path.pop(); - // Pop `/deps` - path.pop(); - - path.push("rustlings"); - let mut path = path.into_os_string(); - path.push(EXE_SUFFIX); - path - }; - - let mut cmd = Command::new(rustlings_bin); + let mut cmd = Command::new(env!("CARGO_BIN_EXE_rustlings")); if let Some(current_dir) = self.current_dir { cmd.current_dir(current_dir); diff --git a/website/config.toml b/website/config.toml index 0c01dc7d26..73ae7f2cfe 100644 --- a/website/config.toml +++ b/website/config.toml @@ -6,11 +6,11 @@ compile_sass = false build_search_index = false [markdown] -highlight_code = true -highlight_theme = "dracula" - insert_anchor_links = "heading" +[markdown.highlighting] +theme = "dracula" + [extra] logo_path = "images/happy_ferris.svg" diff --git a/website/input.css b/website/input.css index af0675d8b7..01c956d69a 100644 --- a/website/input.css +++ b/website/input.css @@ -41,14 +41,10 @@ @apply md:w-3/4 lg:w-3/5; } blockquote { - @apply px-3 pt-2 pb-0.5 mb-4 mt-2 border-s-4 border-white/80 bg-white/7 rounded-sm; + @apply px-3 pt-2 pb-px mb-4 mt-2 border-s-4 border-white/80 bg-white/7 rounded-sm; } pre { - @apply px-2 pt-2 pb-px overflow-x-auto text-sm sm:text-base rounded-sm mt-2 mb-4 after:content-[attr(data-lang)] after:text-[8px] after:opacity-40 selection:bg-white/15; - } - pre code mark { - @apply pb-0.5 pt-1 pr-px text-inherit rounded-xs; + @apply px-2 pt-2 pb-1.5 overflow-x-auto text-sm sm:text-base rounded-sm mt-2 mb-4 selection:bg-white/15; } } - diff --git a/website/package.json b/website/package.json index 38dd27e995..80c84872fa 100644 --- a/website/package.json +++ b/website/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "@tailwindcss/cli": "^4.1" + "@tailwindcss/cli": "^4" } }