Compare commits

...

3 Commits

Author SHA1 Message Date
Ferdinand Schober
b316af6a8f fix vs-version 2026-08-31 10:51:17 +02:00
Ferdinand Schober
d09a574380 tell gvsbuild to target newer VisualStudio version 2026-08-31 10:44:58 +02:00
Ferdinand Schober
b115208aad fix clippy lint 2026-08-31 10:34:02 +02:00
3 changed files with 4 additions and 4 deletions

View File

@@ -105,7 +105,7 @@ jobs:
# see https://github.com/wingtk/gvsbuild/pull/1004
Move-Item "C:\Program Files\Git\usr\bin" "C:\Program Files\Git\usr\notbin"
Move-Item "C:\Program Files\Git\bin" "C:\Program Files\Git\notbin"
gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
gvsbuild build --vs-ver=vs2026 --msys-dir=C:\msys64 gtk4 libadwaita librsvg
Move-Item "C:\Program Files\Git\usr\notbin" "C:\Program Files\Git\usr\bin"
Move-Item "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
- uses: actions/checkout@v6

View File

@@ -83,7 +83,7 @@ jobs:
py -m venv .venv
.venv\Scripts\activate.ps1
py -m pip install gvsbuild
gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
gvsbuild build --vs-ver=vs2026 --msys-dir=C:\msys64 gtk4 libadwaita librsvg
- name: cargo build
if: matrix.job == 'build'
run: cargo build

View File

@@ -518,7 +518,7 @@ impl Config {
}
pub fn read_from_disk(&mut self) -> Result<bool, io::Error> {
log::info!("reading config from {:?}", &self.config_path);
log::info!("reading config from {:?}", self.config_path);
let current_config = fs::read_to_string(&self.config_path)?;
let current_config = match current_config.parse::<DocumentMut>() {
@@ -548,7 +548,7 @@ impl Config {
}
pub fn write_back(&mut self) -> Result<(), io::Error> {
log::info!("writing config to {:?}", &self.config_path);
log::info!("writing config to {:?}", self.config_path);
/* the new config */
let new_config = self.config_toml.clone().unwrap_or_default();
let new_config = toml_edit::ser::to_string_pretty(&new_config).expect("config");