From 52f732e2d10f241bf29ff8e50f187e7ca75070b2 Mon Sep 17 00:00:00 2001 From: Tobias Wolf Date: Sat, 14 Nov 2026 13:55:32 +0100 Subject: [PATCH] Bump version to v1.0.2 Signed-off-by: Tobias Wolf On-behalf-of: SAP --- .github/actions/setup/action.yml | 2 +- poetry.lock | 16 ++++++++-------- pyproject.toml | 2 +- src/gardenlinux/features/artifact_base_name.py | 4 +++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index ede1c5d0..56368c31 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: "1.0.1" + default: "1.0.2" python_version: description: Python version to setup default: "3.14" diff --git a/poetry.lock b/poetry.lock index 199ddb06..34db1ad1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.2.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.5.1 and should not be changed by hand. [[package]] name = "alabaster" @@ -635,7 +635,7 @@ files = [ [package.dependencies] jmespath = ">=0.7.1,<2.0.0" python-dateutil = ">=2.1,<3.0.0" -urllib3 = ">=1.25.4,<2.2.0 || >2.2.0,<3" +urllib3 = ">=1.25.4,!=2.2.0,<3" [package.extras] crt = ["awscrt (==0.38.0)"] @@ -1328,7 +1328,7 @@ files = [ [package.dependencies] attrs = ">=22.2.0" -jsonschema-specifications = ">=2023.03.6" +jsonschema-specifications = ">=2023.3.6" referencing = ">=0.28.4" rpds-py = ">=0.25.0" @@ -1711,11 +1711,11 @@ files = [ [package.dependencies] boto3 = ">=1.9.201" -botocore = ">=1.20.88,<1.35.45 || >1.35.45,<1.35.46 || >1.35.46" +botocore = ">=1.20.88,!=1.35.45,!=1.35.46" cryptography = ">=35.0.0" requests = ">=2.5" -responses = ">=0.15.0,<0.25.5 || >0.25.5" -werkzeug = ">=0.5,<2.2.0 || >2.2.0,<2.2.1 || >2.2.1" +responses = ">=0.15.0,!=0.25.5" +werkzeug = ">=0.5,!=2.2.0,!=2.2.1" xmltodict = "*" [package.extras] @@ -2633,10 +2633,10 @@ files = [ ] [package.dependencies] -botocore = ">=1.37.4,<2.0a.0" +botocore = ">=1.37.4,<2.0a0" [package.extras] -crt = ["botocore[crt] (>=1.37.4,<2.0a.0)"] +crt = ["botocore[crt] (>=1.37.4,<2.0a0)"] [[package]] name = "semver" diff --git a/pyproject.toml b/pyproject.toml index 4755f133..4386ca5e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gardenlinux" -version = "1.0.1" +version = "1.0.2" 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/features/artifact_base_name.py b/src/gardenlinux/features/artifact_base_name.py index 4a0f2b42..43a0ed85 100644 --- a/src/gardenlinux/features/artifact_base_name.py +++ b/src/gardenlinux/features/artifact_base_name.py @@ -434,9 +434,11 @@ def new_instance( raise RuntimeError("Version does not match the given argument") if commit_id_or_hash: + commit_id = commit_id_or_hash[:8] + if abn_object.commit_hash and abn_object.commit_hash != commit_id_or_hash: raise RuntimeError("Commit hash does not match the given argument") - elif abn_object.commit_id != commit_id_or_hash[:8]: + elif abn_object.commit_id != commit_id: raise RuntimeError("Commit ID does not match the given argument") return abn_object