diff --git a/images/gitea/src/cmd/package.rs b/images/gitea/src/cmd/package.rs index d82d765..314fbff 100644 --- a/images/gitea/src/cmd/package.rs +++ b/images/gitea/src/cmd/package.rs @@ -5,7 +5,7 @@ use std::path::Path; use cli_table::format::Justify; use cli_table::{Cell, Style, Table}; use color_eyre::eyre::{self, Context}; -use color_eyre::{Help, Report, Result}; +use color_eyre::{Help, Report, Result, SectionExt as _}; use globwalk::{DirEntry, GlobWalkerBuilder}; use reqwest::StatusCode; use serde::{Deserialize, Serialize}; @@ -275,7 +275,10 @@ pub(crate) fn run(action: &Action) -> Result<()> { eyre::bail!("No data received on stdin"); } - serde_json::from_str(&buf).wrap_err("Failed to parse stdin")? + serde_json::from_str(&buf) + .wrap_err("Failed to parse config") + .with_suggestion(|| "Double-check the `source` and `params` sections in your pipeline") + .with_section(|| buf.header("JSON"))? }; match action { diff --git a/images/gitea/src/cmd/pr.rs b/images/gitea/src/cmd/pr.rs index a20f39a..99dc439 100644 --- a/images/gitea/src/cmd/pr.rs +++ b/images/gitea/src/cmd/pr.rs @@ -5,7 +5,7 @@ use std::path::Path; use cli_table::format::Justify; use cli_table::{print_stderr, Cell, Style, Table}; use color_eyre::eyre::{self, Context}; -use color_eyre::Result; +use color_eyre::{Result, Section as _, SectionExt as _}; use reqwest::blocking::Response; use serde::{Deserialize, Serialize}; use serde_json::json; @@ -160,7 +160,10 @@ pub(crate) fn run(action: &Action) -> Result<()> { eyre::bail!("No data received on stdin"); } - serde_json::from_str(&buf).wrap_err("Failed to parse stdin")? + serde_json::from_str(&buf) + .wrap_err("Failed to parse config") + .with_suggestion(|| "Double-check the `source` and `params` sections in your pipeline") + .with_section(|| buf.header("JSON"))? }; match action { diff --git a/images/gitea/src/cmd/status.rs b/images/gitea/src/cmd/status.rs index 5533bae..8c68f09 100644 --- a/images/gitea/src/cmd/status.rs +++ b/images/gitea/src/cmd/status.rs @@ -144,7 +144,10 @@ pub(crate) fn run(action: &Action) -> Result<()> { } serde_json::from_str(&buf) - .wrap_err("Failed to parse stdin") + .wrap_err("Failed to parse config") + .with_suggestion(|| { + "Double-check the `source` and `params` sections in your pipeline" + }) .with_section(|| buf.header("JSON"))? }; diff --git a/pipelines/build-and-push.yml.j2 b/pipelines/build-and-push.yml.j2 index 7c3ef2b..6a8efd3 100644 --- a/pipelines/build-and-push.yml.j2 +++ b/pipelines/build-and-push.yml.j2 @@ -6,7 +6,7 @@ access_token: ((forgejo_api_key)) url: ((forgejo_url)) owner: ((repo_owner)) - name: ((repo_name)) + repo: ((repo_name)) type: generic context: build/{{name}} description: Building image {{name}} diff --git a/pipelines/jobs/gitea.yml.j2 b/pipelines/jobs/gitea.yml.j2 index c911653..2b700c9 100644 --- a/pipelines/jobs/gitea.yml.j2 +++ b/pipelines/jobs/gitea.yml.j2 @@ -35,7 +35,7 @@ access_token: ((forgejo_api_key)) url: ((forgejo_url)) owner: ((repo_owner)) - name: ((repo_name)) + repo: ((repo_name)) type: generic context: build/gitea description: Building images gitea-package, gitea-pr, gitea-status diff --git a/pipelines/jobs/rust-xwin.yml.j2 b/pipelines/jobs/rust-xwin.yml.j2 index 1e5b2d1..11d8bd8 100644 --- a/pipelines/jobs/rust-xwin.yml.j2 +++ b/pipelines/jobs/rust-xwin.yml.j2 @@ -5,7 +5,7 @@ access_token: ((forgejo_api_key)) url: ((forgejo_url)) owner: ((repo_owner)) - name: ((repo_name)) + repo: ((repo_name)) type: generic context: build/rust-xwin description: Building image rust-xwin