From 1d8eb5de52df5a95b8ebbae8cf3b5c612dc6eac3 Mon Sep 17 00:00:00 2001 From: Tobias Wolf Date: Fri, 24 Oct 2025 08:57:30 +0200 Subject: [PATCH] Revert "Tests: Properly catch all invalid artifacts" This reverts commit cf80d58615334bfa165353439fa10613a00fa54b. --- .github/actions/features_parse/action.yml | 2 +- .github/actions/flavors_parse/action.yml | 2 +- .github/actions/setup/action.yml | 2 +- pyproject.toml | 2 +- src/gardenlinux/s3/s3_artifacts.py | 12 ------------ 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/actions/features_parse/action.yml b/.github/actions/features_parse/action.yml index f01bedb2..a97499a6 100644 --- a/.github/actions/features_parse/action.yml +++ b/.github/actions/features_parse/action.yml @@ -11,7 +11,7 @@ outputs: runs: using: composite steps: - - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.10.0 + - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.10.3 - id: result shell: bash run: | diff --git a/.github/actions/flavors_parse/action.yml b/.github/actions/flavors_parse/action.yml index c29d8ea6..c7a221a3 100644 --- a/.github/actions/flavors_parse/action.yml +++ b/.github/actions/flavors_parse/action.yml @@ -13,7 +13,7 @@ outputs: runs: using: composite steps: - - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.10.0 + - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.10.3 - id: matrix shell: bash run: | diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index bdf6a3df..e0f68137 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -4,7 +4,7 @@ description: Installs the given GardenLinux Python library inputs: version: description: GardenLinux Python library version - default: "0.10.2" + default: "0.10.3" python_version: description: Python version to setup default: "3.13" diff --git a/pyproject.toml b/pyproject.toml index b1281e5e..ff9eaf50 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gardenlinux" -version = "0.10.2" +version = "0.10.3" description = "Contains tools to work with the features directory of gardenlinux, for example deducting dependencies from feature sets or validating cnames" authors = ["Garden Linux Maintainers "] license = "Apache-2.0" diff --git a/src/gardenlinux/s3/s3_artifacts.py b/src/gardenlinux/s3/s3_artifacts.py index 89e9dd8c..34179d14 100644 --- a/src/gardenlinux/s3/s3_artifacts.py +++ b/src/gardenlinux/s3/s3_artifacts.py @@ -189,18 +189,6 @@ def upload_from_directory( "paths": [], } - # Catch any invalid artifacts - bad_files = [ - f - for f in artifacts_dir.iterdir() - if not f.name.startswith(cname) - and f.suffix not in [".release", ".requirements"] - ] - if bad_files: - raise RuntimeError( - f"Artifact name '{bad_files[0].name}' does not start with cname '{cname}'" - ) - for artifact in artifacts_dir.iterdir(): if not artifact.match(f"{cname}*"): continue