Merge pull request 'Merge testing in main: Release 1.2.2' (#28) from testing into main

Reviewed-on: #28

.gitea/workflows/main.yaml

@@ -6,8 +6,32 @@ on:
       - main
 
 jobs:
+  detect-changes:
+    name: Erkenne relevante Code-Änderungen
+    runs-on: ubuntu-latest
+    outputs:
+      code_changed: ${{ steps.filter.outputs.code }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v7
+
+      - name: Prüfe auf Änderungen am Programmcode
+        uses: dorny/paths-filter@v4
+        id: filter
+        with:
+          filters: |
+            code:
+              - 'src/**'
+              - 'Cargo.toml'
+              - 'Cargo.lock'
+              - 'scripts/**'
+              - '.cargo/**'
+              - '.gitea/workflows/main.yaml'
+
   release-and-publish:
     name: Build, Publish Packages (Stable) & Create Release
+    needs: detect-changes
+    if: needs.detect-changes.outputs.code_changed == 'true'
     runs-on: ubuntu-latest
     env:
       CARGO_BINSTALL_VERSION: "1.23.0"

.gitea/workflows/renovate.yaml

@@ -19,6 +19,7 @@ jobs:
           RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
           RENOVATE_REPOSITORIES: ${{ gitea.repository || github.repository }}
           RENOVATE_AUTODISCOVER: "false"
+          RENOVATE_ALLOW_CUSTOM_CRATE_REGISTRIES: "true"
           RENOVATE_GIT_AUTHOR: "Renovate Bot <renovate-bot@creativedragonslayer.de>"
           RENOVATE_HOST_RULES: >-
             [{"hostType":"cargo","matchHost":"${{ gitea.server_url || github.server_url }}","token":"${{ secrets.RENOVATE_TOKEN }}"}]

.gitea/workflows/testing.yaml

@@ -6,8 +6,32 @@ on:
       - testing
 
 jobs:
+  detect-changes:
+    name: Erkenne relevante Code-Änderungen
+    runs-on: ubuntu-latest
+    outputs:
+      code_changed: ${{ steps.filter.outputs.code }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v7
+
+      - name: Prüfe auf Änderungen am Programmcode
+        uses: dorny/paths-filter@v4
+        id: filter
+        with:
+          filters: |
+            code:
+              - 'src/**'
+              - 'Cargo.toml'
+              - 'Cargo.lock'
+              - 'scripts/**'
+              - '.cargo/**'
+              - '.gitea/workflows/testing.yaml'
+
   build-and-publish:
     name: Build, Publish Packages (Testing) & Create Preview Release
+    needs: detect-changes
+    if: needs.detect-changes.outputs.code_changed == 'true'
     runs-on: ubuntu-latest
     env:
       CARGO_BINSTALL_VERSION: "1.23.0"

Cargo.lock

@@ -76,7 +76,7 @@ checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 
 [[package]]
 name = "docker-update"
-version = "1.2.1"
+version = "1.2.2"
 dependencies = [
  "config-ctdra",
  "logger-ctdra",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "docker-update"
-version = "1.2.1"
+version = "1.2.2"
 edition = "2024"
 authors = ['DragonSlayer_14']
 readme = "README.md"

README.md

@@ -1,5 +1,8 @@
 # DockerUpdate (`docker-update`)
 
+[![Main Release & Publish](https://gitea.creative-dragonslayer.de/Linuxapps/DockerUpdate/actions/workflows/main.yaml/badge.svg?branch=main)](https://gitea.creative-dragonslayer.de/Linuxapps/DockerUpdate/actions?workflow=main.yaml)
+[![Testing Build, Publish & Preview Release](https://gitea.creative-dragonslayer.de/Linuxapps/DockerUpdate/actions/workflows/testing.yaml/badge.svg?branch=testing)](https://gitea.creative-dragonslayer.de/Linuxapps/DockerUpdate/actions?workflow=testing.yaml)
+
 `docker-update` ist ein schlankes CLI-Werkzeug für Linux-Server, das Docker-Compose-basierte Applikationen automatisch
 auf neuere Versionen prüft, aktualisiert und neu startet.
 

renovate.json

@@ -7,7 +7,6 @@
   "schedule": [
     "before 6am on monday"
   ],
-  "allowCustomCrateRegistries": true,
   "baseBranchPatterns": [
     "dev"
   ],

src/config.rs

@@ -7,20 +7,12 @@ use config_ctdra::get_config as get_cached_config;
 use serde::{Deserialize, Serialize};
 
 /// Hauptkonfigurationsstruktur der Anwendung.
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Default)]
 pub struct AppConfig {
     /// Allgemeine Einstellungen
     pub general: General,
 }
 
-impl Default for AppConfig {
-    fn default() -> Self {
-        Self {
-            general: General::default(),
-        }
-    }
-}
-
 /// Allgemeine Konfigurationseinstellungen.
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub struct General {

src/updater.rs

@@ -111,14 +111,13 @@ pub fn run_compose_command(dir: &Path, args: &[&str]) -> std::io::Result<Output>
                     || stderr.contains("unknown command \"compose\"")
                     || stderr.contains("unknown command: compose"));
 
-            if is_unavailable {
-                if let Ok(fallback_out) = Command::new("docker-compose")
+            if is_unavailable
+                && let Ok(fallback_out) = Command::new("docker-compose")
                     .current_dir(dir)
                     .args(args)
                     .output()
-                {
-                    return Ok(fallback_out);
-                }
+            {
+                return Ok(fallback_out);
             }
             Ok(out)
         }