reivilibre/mirror-zola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fmt + change min version

Browse Source
This commit is contained in:
Vincent Prouillet 2023-01-09 18:58:18 +01:00 committed by Vincent Prouillet
parent fcbb21abca
commit e12b766e2c
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
azure-pipelines.yml
View File

@ -21,7 +21,7 @@ stages:
rustup_toolchain: stable rustup_toolchain: stable
linux-pinned: linux-pinned:
imageName: 'ubuntu-20.04' imageName: 'ubuntu-20.04'
rustup_toolchain: 1.60.0 rustup_toolchain: 1.61.0
pool: pool:
vmImage: $(imageName) vmImage: $(imageName)
steps: steps:

2
components/site/src/minify.rs
View File

@ -1,8 +1,6 @@
use errors::{bail, Result}; use errors::{bail, Result};
use libs::minify_html::{minify, Cfg}; use libs::minify_html::{minify, Cfg};
// TODO: move to site
pub fn html(html: String) -> Result<String> { pub fn html(html: String) -> Result<String> {
let mut cfg = Cfg::spec_compliant(); let mut cfg = Cfg::spec_compliant();
cfg.keep_html_and_head_opening_tags = true; cfg.keep_html_and_head_opening_tags = true;

7
components/site/src/sass.rs
View File

@ -9,7 +9,6 @@ use crate::anyhow;
use errors::{bail, Result}; use errors::{bail, Result};
use utils::fs::{create_file, ensure_directory_exists}; use utils::fs::{create_file, ensure_directory_exists};
pub fn compile_sass(base_path: &Path, output_path: &Path) -> Result<()> { pub fn compile_sass(base_path: &Path, output_path: &Path) -> Result<()> {
ensure_directory_exists(output_path)?; ensure_directory_exists(output_path)?;
@ -77,7 +76,8 @@ mod tests {
fn test_get_non_partial_scss() { fn test_get_non_partial_scss() {
use std::env; use std::env;
let mut path = env::current_dir().unwrap().parent().unwrap().parent().unwrap().to_path_buf(); let mut path =
env::current_dir().unwrap().parent().unwrap().parent().unwrap().to_path_buf();
path.push("test_site"); path.push("test_site");
path.push("sass"); path.push("sass");
@ -91,7 +91,8 @@ mod tests {
fn test_get_non_partial_scss_underscores() { fn test_get_non_partial_scss_underscores() {
use std::env; use std::env;
let mut path = env::current_dir().unwrap().parent().unwrap().parent().unwrap().to_path_buf(); let mut path =
env::current_dir().unwrap().parent().unwrap().parent().unwrap().to_path_buf();
path.push("test_site"); path.push("test_site");
path.push("_dir_with_underscores"); path.push("_dir_with_underscores");
path.push(".."); path.push("..");