mirror of
https://github.com/feschber/lan-mouse.git
synced 2026-09-17 18:01:11 +03:00
Compare commits
4 Commits
main-133e1
...
main-b316a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b316af6a8f | ||
|
|
d09a574380 | ||
|
|
b115208aad | ||
|
|
392af44cbe |
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -105,7 +105,7 @@ jobs:
|
|||||||
# see https://github.com/wingtk/gvsbuild/pull/1004
|
# 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\usr\bin" "C:\Program Files\Git\usr\notbin"
|
||||||
Move-Item "C:\Program Files\Git\bin" "C:\Program Files\Git\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\usr\notbin" "C:\Program Files\Git\usr\bin"
|
||||||
Move-Item "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
|
Move-Item "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
|
|||||||
10
.github/workflows/rust.yml
vendored
10
.github/workflows/rust.yml
vendored
@@ -40,7 +40,6 @@ jobs:
|
|||||||
- test
|
- test
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- uses: Swatinem/rust-cache@v2
|
|
||||||
- name: Install Linux deps
|
- name: Install Linux deps
|
||||||
if: runner.os == 'Linux'
|
if: runner.os == 'Linux'
|
||||||
run: |
|
run: |
|
||||||
@@ -49,6 +48,13 @@ jobs:
|
|||||||
- name: Install macOS dependencies
|
- name: Install macOS dependencies
|
||||||
if: runner.os == 'macOS'
|
if: runner.os == 'macOS'
|
||||||
run: brew install gtk4 libadwaita imagemagick
|
run: brew install gtk4 libadwaita imagemagick
|
||||||
|
- name: Record macOS native lib versions for cache key
|
||||||
|
if: runner.os == 'macOS'
|
||||||
|
run: |
|
||||||
|
echo "MACOS_LIB_VER=$(brew list --versions glib gtk4 libadwaita | tr '\n' '_')" >> "$GITHUB_ENV"
|
||||||
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
with:
|
||||||
|
prefix-key: ${{ env.MACOS_LIB_VER }}
|
||||||
- name: Install Windows Dependencies - create gtk dir
|
- name: Install Windows Dependencies - create gtk dir
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
run: mkdir C:\gtk-build\gtk\x64\release
|
run: mkdir C:\gtk-build\gtk\x64\release
|
||||||
@@ -77,7 +83,7 @@ jobs:
|
|||||||
py -m venv .venv
|
py -m venv .venv
|
||||||
.venv\Scripts\activate.ps1
|
.venv\Scripts\activate.ps1
|
||||||
py -m pip install gvsbuild
|
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
|
- name: cargo build
|
||||||
if: matrix.job == 'build'
|
if: matrix.job == 'build'
|
||||||
run: cargo build
|
run: cargo build
|
||||||
|
|||||||
@@ -518,7 +518,7 @@ impl Config {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn read_from_disk(&mut self) -> Result<bool, io::Error> {
|
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 = fs::read_to_string(&self.config_path)?;
|
||||||
let current_config = match current_config.parse::<DocumentMut>() {
|
let current_config = match current_config.parse::<DocumentMut>() {
|
||||||
@@ -548,7 +548,7 @@ impl Config {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn write_back(&mut self) -> Result<(), io::Error> {
|
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 */
|
/* the new config */
|
||||||
let new_config = self.config_toml.clone().unwrap_or_default();
|
let new_config = self.config_toml.clone().unwrap_or_default();
|
||||||
let new_config = toml_edit::ser::to_string_pretty(&new_config).expect("config");
|
let new_config = toml_edit::ser::to_string_pretty(&new_config).expect("config");
|
||||||
|
|||||||
Reference in New Issue
Block a user