Merge branch 'master' of https://git.cscherr.de/PlexSheep/autocrate

.autocrate.yaml

@@ -17,14 +17,14 @@ api:
     type: github
     repository: autocrate
     auth:
-      user: plexsheep
+      user: PlexSheep
       pass:
         !env TOKEN_GH
-  # cscherr:
+  cscherr:
-  #   type: forgejo
+    type: forgejo
-  #   endpoint: https://git.cscherr.de
+    endpoint: https://git.cscherr.de
-  #   repository: autocrate
+    repository: autocrate
-  #   auth:
+    auth:
-  #     user: PlexSheep
+      user: PlexSheep
-  #     pass:
+      pass:
-  #       !env TOKEN_CSCHERR
+        !env TOKEN_CSCHERR

.gitea/workflows/cargo.yaml

@@ -37,7 +37,7 @@ jobs:
       - name: cargo fmt
         run: cargo fmt --all
       - name: cargo test
-        run: cargo test --all-features --all-targets --workspace && cargo test --all-features --workspace --doc
+        run: cargo test --all-features --all-targets --workspace
       - name: commit back to repository
         uses: https://github.com/stefanzweifel/git-auto-commit-action@v5
         with:

.github/workflows/cargo.yaml

@@ -38,7 +38,7 @@ jobs:
       - name: cargo fmt
         run: cargo fmt --all
       - name: cargo test
-        run: cargo test --all-features --all-targets --workspace && cargo test --all-features --workspace --doc
+        run: cargo test --all-features --all-targets --workspace
       - name: commit back to repository
         uses: stefanzweifel/git-auto-commit-action@v5
         with:

src/config/mod.rs

@@ -8,7 +8,7 @@ use libpt::log::{debug, error, trace};
 use serde::{Deserialize, Serialize};
 use url::Url;
 
-use crate::{error::*, git};
+use crate::error::*;
 
 pub mod cli;
 pub mod packages;
@@ -295,7 +295,14 @@ impl Debug for Config {
 
 impl Config {
     pub fn load(cli: &Cli) -> Result<Self> {
-        let repo = git::get_repo()?;
+        let repo = match git2::Repository::open_from_env() {
+            Ok(repo) => repo,
+            Err(_err) => {
+                let err = ConfigError::GitRepoNotFound.into();
+                error!("{err}");
+                return Err(err);
+            }
+        };
         let mut path = repo.path().to_path_buf();
         path.pop(); // we want the real root, not the `.git` dir
 

src/main.rs

@@ -1,3 +1,5 @@
+use std::error::Error as _;
+
 use autocrate::{
     changelog::*,
     config::{
@@ -9,25 +11,37 @@ use autocrate::{
     release::release,
     serverapi::ApiCollection,
 };
-use libpt::log::{debug, error, trace};
+use libpt::log::{debug, error};
 
 #[tokio::main]
 async fn main() -> Result<()> {
     let cli = Cli::cli_parse();
     let cfg = Config::load(&cli)?;
 
-    match cli.command {
+    let status: Option<Error> = match cli.command {
         Commands::Changelog { .. } => {
-            println!("{}", Changelog::build(&cfg)?);
+            let chlog = Changelog::build(&cfg);
+            if chlog.is_ok() {
+                println!("{}", chlog.unwrap());
+                None
+            } else {
+                Some(chlog.unwrap_err())
+            }
         }
         Commands::Release { .. } => {
             // TODO: check if repo is dirty and create a commit with a given option
             let mut apis = ApiCollection::build(&cfg).await?;
-            release(&cfg, &mut apis).await?;
+            match release(&cfg, &mut apis).await {
+                Ok(_) => None,
+                Err(err) => Some(err),
+            }
         }
         Commands::Publish { .. } => {
             // TODO: check if repo is dirty and create a commit with a given option
-            publish(&cfg).await?;
+            match publish(&cfg).await {
+                Ok(_) => None,
+                Err(err) => Some(err),
+            }
         }
         Commands::Version {} => {
             // TODO: version bump
@@ -42,7 +56,7 @@ async fn main() -> Result<()> {
     };
     if let Some(err) = status {
         error!("{err}");
-        trace!("{:#?}", err.source());
+        debug!("{:#?}", err.source());
     }
     Ok(())
 }

src/serverapi/github.rs

@@ -1,5 +1,4 @@
 use async_trait::async_trait;
-use libpt::log::debug;
 use octocrab;
 
 use super::{PublishContext, ReleaseContext, ServerApi};
@@ -22,18 +21,18 @@ impl Github {
 #[async_trait]
 impl ServerApi for Github {
     async fn push_release(&mut self, rc: ReleaseContext) -> Result<()> {
-        debug!("release context: {rc:#?}");
+        let _response = octocrab::instance()
-        let t1 = octocrab::instance();
+            .repos(rc.username, rc.repository)
-        let t2 = t1.repos(rc.username, rc.repository);
+            .releases()
-        let t = t2.releases();
-        let req = t
             .create(&rc.tag)
             .target_commitish(&rc.commit_sig)
             .name(&rc.tag)
             .body(&rc.text)
             .draft(rc.draft)
-            .prerelease(rc.prerelease);
+            .prerelease(rc.prerelease)
-        req.send().await.map_err(ServerApiError::from)?;
+            .send()
+            .await
+            .map_err(ServerApiError::from)?;
         Ok(())
     }
     async fn push_release_artifact(&mut self, _rc: ReleaseContext) -> Result<()> {