Merge pull request 'Merge dev in testing: Erweitert Workflow-Skripte um Vulnverability und Dependency-Scanning' (#16) from dev into testing

Reviewed-on: #16

.gitea/workflows/main.yaml

@@ -9,10 +9,6 @@ jobs:
   release-and-publish:
     name: Build, Publish Packages (Stable) & Create Release
     runs-on: ubuntu-latest
-    env:
-      CARGO_BINSTALL_VERSION: "1.23.0"
-      CARGO_DEB_VERSION: "3.8.0"
-      CARGO_GENERATE_RPM_VERSION: "0.21.0"
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v7
@@ -34,47 +30,18 @@ jobs:
           restore-keys: |
             cargo-${{ runner.os }}-
 
-      - name: Alte Paketierungs-Ausgaben aus dem Cache entfernen
+      - name: Install Cross-Compilation Toolchains & Dependencies
-        run: rm -rf target/debian target/generate-rpm target/arch
-
-      - name: Install Cross-Compilation Toolchains (apt)
         run: |
           sudo apt-get update
           sudo apt-get install -y gcc-aarch64-linux-gnu gcc-i686-linux-gnu
-
+          rustup target add x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu i686-unknown-linux-gnu
-      - name: Ermittle Rust-Version für Rustup-Target-Cache-Key
-        run: echo "RUST_VERSION=$(rustc --version | awk '{print $2}')" >> "$GITHUB_ENV"
-
-      - name: Cache Rustup Cross-Compilation-Targets
-        id: cache-rustup-targets
-        uses: actions/cache@v6
-        with:
-          path: |
-            ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/aarch64-unknown-linux-gnu
-            ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/i686-unknown-linux-gnu
-          key: rustup-targets-${{ runner.os }}-${{ env.RUST_VERSION }}
-
-      - name: Add Rust Cross-Compilation Targets
-        if: steps.cache-rustup-targets.outputs.cache-hit != 'true'
-        run: rustup target add aarch64-unknown-linux-gnu i686-unknown-linux-gnu
-
-      - name: PATH um Cargo-bin-Verzeichnis ergänzen
-        run: |
-          mkdir -p ~/.cargo/bin
-          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-
-      - name: Cache Packaging-Tools (cargo-binstall, cargo-deb, cargo-generate-rpm)
-        id: cache-packaging-tools
-        uses: actions/cache@v6
-        with:
-          path: ~/.cargo/bin
-          key: packaging-tools-${{ runner.os }}-${{ env.CARGO_BINSTALL_VERSION }}-${{ env.CARGO_DEB_VERSION }}-${{ env.CARGO_GENERATE_RPM_VERSION }}
 
       - name: Install Packaging Tools (Prebuilt Binaries)
-        if: steps.cache-packaging-tools.outputs.cache-hit != 'true'
         run: |
-          curl -fsSL "https://github.com/cargo-bins/cargo-binstall/releases/download/v${CARGO_BINSTALL_VERSION}/cargo-binstall-x86_64-unknown-linux-musl.tgz" | tar -xz -C ~/.cargo/bin
+          mkdir -p ~/.cargo/bin
-          ~/.cargo/bin/cargo-binstall -y --no-symlinks "cargo-deb@${CARGO_DEB_VERSION}" "cargo-generate-rpm@${CARGO_GENERATE_RPM_VERSION}"
+          curl -fsSL https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz | tar -xz -C ~/.cargo/bin
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+          ~/.cargo/bin/cargo-binstall -y --no-symlinks cargo-deb cargo-generate-rpm
 
       - name: Run Tests
         run: |

.gitea/workflows/testing.yaml

@@ -9,10 +9,6 @@ jobs:
   build-and-publish:
     name: Build, Publish Packages (Testing) & Create Preview Release
     runs-on: ubuntu-latest
-    env:
-      CARGO_BINSTALL_VERSION: "1.23.0"
-      CARGO_DEB_VERSION: "3.8.0"
-      CARGO_GENERATE_RPM_VERSION: "0.21.0"
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v7
@@ -34,47 +30,18 @@ jobs:
           restore-keys: |
             cargo-${{ runner.os }}-
 
-      - name: Alte Paketierungs-Ausgaben aus dem Cache entfernen
+      - name: Install Cross-Compilation Toolchains & Dependencies
-        run: rm -rf target/debian target/generate-rpm target/arch
-
-      - name: Install Cross-Compilation Toolchains (apt)
         run: |
           sudo apt-get update
           sudo apt-get install -y gcc-aarch64-linux-gnu gcc-i686-linux-gnu
-
+          rustup target add x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu i686-unknown-linux-gnu
-      - name: Ermittle Rust-Version für Rustup-Target-Cache-Key
-        run: echo "RUST_VERSION=$(rustc --version | awk '{print $2}')" >> "$GITHUB_ENV"
-
-      - name: Cache Rustup Cross-Compilation-Targets
-        id: cache-rustup-targets
-        uses: actions/cache@v6
-        with:
-          path: |
-            ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/aarch64-unknown-linux-gnu
-            ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/i686-unknown-linux-gnu
-          key: rustup-targets-${{ runner.os }}-${{ env.RUST_VERSION }}
-
-      - name: Add Rust Cross-Compilation Targets
-        if: steps.cache-rustup-targets.outputs.cache-hit != 'true'
-        run: rustup target add aarch64-unknown-linux-gnu i686-unknown-linux-gnu
-
-      - name: PATH um Cargo-bin-Verzeichnis ergänzen
-        run: |
-          mkdir -p ~/.cargo/bin
-          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-
-      - name: Cache Packaging-Tools (cargo-binstall, cargo-deb, cargo-generate-rpm)
-        id: cache-packaging-tools
-        uses: actions/cache@v6
-        with:
-          path: ~/.cargo/bin
-          key: packaging-tools-${{ runner.os }}-${{ env.CARGO_BINSTALL_VERSION }}-${{ env.CARGO_DEB_VERSION }}-${{ env.CARGO_GENERATE_RPM_VERSION }}
 
       - name: Install Packaging Tools (Prebuilt Binaries)
-        if: steps.cache-packaging-tools.outputs.cache-hit != 'true'
         run: |
-          curl -fsSL "https://github.com/cargo-bins/cargo-binstall/releases/download/v${CARGO_BINSTALL_VERSION}/cargo-binstall-x86_64-unknown-linux-musl.tgz" | tar -xz -C ~/.cargo/bin
+          mkdir -p ~/.cargo/bin
-          ~/.cargo/bin/cargo-binstall -y --no-symlinks "cargo-deb@${CARGO_DEB_VERSION}" "cargo-generate-rpm@${CARGO_GENERATE_RPM_VERSION}"
+          curl -fsSL https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz | tar -xz -C ~/.cargo/bin
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+          ~/.cargo/bin/cargo-binstall -y --no-symlinks cargo-deb cargo-generate-rpm
 
       - name: Run Tests
         run: |

.gitea/workflows/unit-tests.yaml

@@ -1,38 +0,0 @@
-name: Unit-Tests
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-    branches:
-      - testing
-
-jobs:
-  test:
-    name: Unit-Tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v7
-
-      - name: Install Rust Toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          cache: false
-
-      - name: Cache Cargo-Abhängigkeiten & Build-Artefakte
-        uses: actions/cache@v6
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: cargo-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}
-          restore-keys: |
-            cargo-${{ runner.os }}-
-
-      - name: Run Tests
-        run: cargo test

README.md

@@ -1,8 +1,5 @@
 # mirror-package
 
-[![Main Release & Publish](https://gitea.creative-dragonslayer.de/Linuxapps/MirrorPackage/actions/workflows/main.yaml/badge.svg?branch=main)](https://gitea.creative-dragonslayer.de/Linuxapps/MirrorPackage/actions?workflow=main.yaml)
-[![Testing Build, Publish & Preview Release](https://gitea.creative-dragonslayer.de/Linuxapps/MirrorPackage/actions/workflows/testing.yaml/badge.svg?branch=testing)](https://gitea.creative-dragonslayer.de/Linuxapps/MirrorPackage/actions?workflow=testing.yaml)
-
 Automatisiertes Werkzeug zum Extrahieren, Herunterladen und Spiegeln vorkompilierter Linux-Pakete aus GitHub-Releases in eine selbstgehostete Gitea- / Forgejo-Paket-Registry.
 
 `mirror-package` überwacht konfigurierte GitHub-Repositories (wie z. B. `raspberrypi/rpi-imager` oder `Heroic-Games-Launcher/HeroicGamesLauncher`), identifiziert vorkompilierte Linux-Pakete (`.deb`, `.rpm`, `.pkg.tar.zst`, `.pkg.tar.xz`, `.pkg.tar.gz`, `.pacman`) und veröffentlicht diese anhand von Release-Stabilitätsregeln automatisch in den passenden Distributionen der Gitea-Paket-Registry.

renovate.json

@@ -54,34 +54,6 @@
       "depNameTemplate": "trufflesecurity/trufflehog",
       "datasourceTemplate": "github-releases",
       "extractVersionTemplate": "^v(?<version>.*)$"
-    },
-    {
-      "customType": "regex",
-      "fileMatch": ["^\\.gitea/workflows/.+\\.ya?ml$"],
-      "matchStrings": [
-        "CARGO_BINSTALL_VERSION:\\s*\"(?<currentValue>[^\"]+)\""
-      ],
-      "depNameTemplate": "cargo-bins/cargo-binstall",
-      "datasourceTemplate": "github-releases",
-      "extractVersionTemplate": "^v(?<version>.*)$"
-    },
-    {
-      "customType": "regex",
-      "fileMatch": ["^\\.gitea/workflows/.+\\.ya?ml$"],
-      "matchStrings": [
-        "CARGO_DEB_VERSION:\\s*\"(?<currentValue>[^\"]+)\""
-      ],
-      "depNameTemplate": "cargo-deb",
-      "datasourceTemplate": "crate"
-    },
-    {
-      "customType": "regex",
-      "fileMatch": ["^\\.gitea/workflows/.+\\.ya?ml$"],
-      "matchStrings": [
-        "CARGO_GENERATE_RPM_VERSION:\\s*\"(?<currentValue>[^\"]+)\""
-      ],
-      "depNameTemplate": "cargo-generate-rpm",
-      "datasourceTemplate": "crate"
     }
   ]
 }

scripts/get-build-number.py

@@ -9,14 +9,9 @@ import os
 import re
 import subprocess
 import sys
-import urllib.error
 import urllib.parse
 import urllib.request
 
-# Paket-Typen, unter denen dasselbe Release veroeffentlicht wird und die sich
-# daher eine gemeinsame Build-Nummer teilen muessen.
-PACKAGE_TYPES = ("debian", "rpm", "arch")
-
 
 def get_cargo_pkg_info():
     try:
@@ -88,29 +83,20 @@ def query_existing_build_numbers(name, version, gitea_url, repo, owner, token=No
         except Exception as e:
             sys.stderr.write(f"[Hinweis] Konnte Gitea Releases nicht abfragen: {e}\n")
 
-    # 2. Gitea Packages API (falls Token vorhanden): pro Paket-Typ gezielt nur die
+    # 2. Gitea Packages API (falls Token vorhanden)
-    #    neueste Version abfragen (ein Request, keine Pagination noetig). Das haelt
+    if gitea_url and owner and token:
-    #    die Abfrage schnell unabhaengig von der Historie und ist unbeeinflusst von
-    #    Docker-Tags/anderen Paket-Typen, die unter demselben Owner haengen.
-    if gitea_url and owner and token and name:
-        for pkg_type in PACKAGE_TYPES:
         try:
-                url = (
+            url = f"{gitea_url.rstrip('/')}/api/v1/packages/{owner}?limit=50"
-                    f"{gitea_url.rstrip('/')}/api/v1/packages/{owner}/"
-                    f"{pkg_type}/{urllib.parse.quote(name, safe='')}/-/latest"
-                )
             req = urllib.request.Request(url, headers=headers)
             with urllib.request.urlopen(req, timeout=10) as resp:
-                    pkg = json.loads(resp.read().decode())
+                packages = json.loads(resp.read().decode())
+                for pkg in packages:
                     pkg_ver = pkg.get("version", "")
                     m = pattern.search(pkg_ver)
                     if m:
                         build_nums.add(int(m.group(1)))
-            except urllib.error.HTTPError as e:
-                if e.code != 404:
-                    sys.stderr.write(f"[Hinweis] Konnte neueste {pkg_type}-Paketversion nicht abfragen: {e}\n")
         except Exception as e:
-                sys.stderr.write(f"[Hinweis] Konnte neueste {pkg_type}-Paketversion nicht abfragen: {e}\n")
+            sys.stderr.write(f"[Hinweis] Konnte Gitea Packages nicht abfragen: {e}\n")
 
     # 3. Lokales Target-Verzeichnis prüfen
     target_dirs = ["target/debian", "target/generate-rpm", "target/arch"]