From 2d0cdae3962e6941e3529dee314c0c0549908811 Mon Sep 17 00:00:00 2001 From: Breadway Date: Wed, 17 Jun 2026 14:54:59 +0800 Subject: [PATCH 1/6] fix(ci): run release job on hestia host to access cargo and dl server hestia-host maps to host execution on the Forgejo runner, giving access to /home/breadway/.cargo/bin/cargo and /srv/breadway-dl without Docker. --- .forgejo/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index f85b60b..c374bf6 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -10,7 +10,7 @@ env: jobs: build: - runs-on: [self-hosted, hestia] + runs-on: hestia-host steps: - name: checkout run: | From 014fd9c12e367df99729683d2256edc607ee36af Mon Sep 17 00:00:00 2001 From: Breadway Date: Wed, 17 Jun 2026 18:54:32 +0800 Subject: [PATCH 2/6] fix(ci): add cargo to PATH for host runner --- .forgejo/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index c374bf6..384b829 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -7,6 +7,7 @@ on: env: DL_DIR: /srv/breadway-dl ECOSYSTEM_DIR: /home/breadway/Projects/bread-ecosystem + PATH: /home/breadway/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin jobs: build: From b064e86f2f793239b2004c21c4c46809ee347321 Mon Sep 17 00:00:00 2001 From: Breadway Date: Wed, 17 Jun 2026 19:09:15 +0800 Subject: [PATCH 3/6] fix(ci): clone to /tmp to avoid stale work-dir permissions, use hestia label --- .forgejo/workflows/release.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 384b829..cd57261 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -11,18 +11,24 @@ env: jobs: build: - runs-on: hestia-host + runs-on: hestia + defaults: + run: + working-directory: /tmp/breadpaper-build + steps: - name: checkout + working-directory: /tmp run: | + rm -rf /tmp/breadpaper-build git clone --branch "${GITHUB_REF_NAME}" --depth 1 \ - "https://git.breadway.dev/${GITHUB_REPOSITORY}.git" . + "https://git.breadway.dev/${GITHUB_REPOSITORY}.git" /tmp/breadpaper-build - name: build - run: cargo build --release --locked + run: /home/breadway/.cargo/bin/cargo build --release --locked - name: test - run: cargo test --release --locked + run: /home/breadway/.cargo/bin/cargo test --release --locked - name: prepare artifacts run: | @@ -37,6 +43,7 @@ jobs: ln -sfn "${VERSION}" "${DL_DIR}/breadpaper/latest" - name: ensure bread-ecosystem + working-directory: /tmp run: | if [[ -d "${ECOSYSTEM_DIR}/.git" ]]; then git -C "${ECOSYSTEM_DIR}" pull --ff-only @@ -46,4 +53,5 @@ jobs: fi - name: regenerate index.json + working-directory: /tmp run: bash "${ECOSYSTEM_DIR}/scripts/gen-index.sh" From 5c9efcf316fc1fac08c9290ec165d9b6290146c0 Mon Sep 17 00:00:00 2001 From: Breadway Date: Wed, 17 Jun 2026 22:44:48 +0800 Subject: [PATCH 4/6] fix: correct awww subcommand to img, support bare path arg, add --version --- src/main.rs | 16 ++++++++++------ src/wallpaper.rs | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main.rs b/src/main.rs index 38d3fc6..d108e3d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,17 +4,19 @@ use std::process; use clap::{Parser, Subcommand}; #[derive(Parser)] -#[command(name = "breadpaper", about = "Wallpaper manager for the bread desktop")] +#[command(name = "breadpaper", version, about = "Wallpaper manager for the bread desktop")] struct Cli { + /// Image file to set as wallpaper (shorthand for `set`) + path: Option, + #[command(subcommand)] - command: Command, + command: Option, } #[derive(Subcommand)] enum Command { /// Set wallpaper, generate pywal palette, and reload bread themes Set { - /// Path to the image file path: PathBuf, }, /// Print the current wallpaper path @@ -24,9 +26,11 @@ enum Command { fn main() { let cli = Cli::parse(); - let result = match cli.command { - Command::Set { path } => breadpaper::set(&path), - Command::Get => breadpaper::get().map(|p| println!("{}", p.display())), + let result = match (cli.command, cli.path) { + (Some(Command::Set { path }), _) | (None, Some(path)) => breadpaper::set(&path), + (Some(Command::Get), _) | (None, None) => { + breadpaper::get().map(|p| println!("{}", p.display())) + } }; if let Err(e) = result { diff --git a/src/wallpaper.rs b/src/wallpaper.rs index 4655308..f59fae1 100644 --- a/src/wallpaper.rs +++ b/src/wallpaper.rs @@ -5,13 +5,13 @@ use anyhow::{Context, Result, bail}; pub fn apply(path: &Path) -> Result<()> { let status = Command::new("awww") - .arg("set") + .arg("img") .arg(path) .status() .context("failed to run awww — is awww-daemon running?")?; if !status.success() { - bail!("awww set exited with {}", status); + bail!("awww img exited with {}", status); } Ok(()) } From 1b4f9c5c044276e86731462fe32d9b33067931d3 Mon Sep 17 00:00:00 2001 From: Breadway Date: Wed, 17 Jun 2026 22:53:08 +0800 Subject: [PATCH 5/6] fix(ci): clone bread-ecosystem to /tmp to avoid stale permissions --- .forgejo/workflows/release.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index cd57261..ff3f0c2 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -6,7 +6,7 @@ on: env: DL_DIR: /srv/breadway-dl - ECOSYSTEM_DIR: /home/breadway/Projects/bread-ecosystem + ECOSYSTEM_DIR: /tmp/bread-ecosystem-ci PATH: /home/breadway/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin jobs: @@ -45,12 +45,8 @@ jobs: - name: ensure bread-ecosystem working-directory: /tmp run: | - if [[ -d "${ECOSYSTEM_DIR}/.git" ]]; then - git -C "${ECOSYSTEM_DIR}" pull --ff-only - else - mkdir -p "$(dirname "${ECOSYSTEM_DIR}")" - git clone https://github.com/Breadway/bread-ecosystem.git "${ECOSYSTEM_DIR}" - fi + rm -rf "${ECOSYSTEM_DIR}" + git clone https://github.com/Breadway/bread-ecosystem.git "${ECOSYSTEM_DIR}" - name: regenerate index.json working-directory: /tmp From 1671af82ee1065b23ae3030f3969d18cc4c3fa36 Mon Sep 17 00:00:00 2001 From: Breadway Date: Fri, 19 Jun 2026 08:38:41 +0800 Subject: [PATCH 6/6] fix: rustfmt violations --- src/main.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index d108e3d..7616f31 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,11 @@ use std::process; use clap::{Parser, Subcommand}; #[derive(Parser)] -#[command(name = "breadpaper", version, about = "Wallpaper manager for the bread desktop")] +#[command( + name = "breadpaper", + version, + about = "Wallpaper manager for the bread desktop" +)] struct Cli { /// Image file to set as wallpaper (shorthand for `set`) path: Option, @@ -16,9 +20,7 @@ struct Cli { #[derive(Subcommand)] enum Command { /// Set wallpaper, generate pywal palette, and reload bread themes - Set { - path: PathBuf, - }, + Set { path: PathBuf }, /// Print the current wallpaper path Get, }