Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/features_parse/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ outputs:
runs:
using: composite
steps:
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.3
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.4
- id: result
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/flavors_parse/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ outputs:
runs:
using: composite
steps:
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.3
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.4
- id: matrix
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Installs the given GardenLinux Python library
inputs:
version:
description: GardenLinux Python library version
default: "0.8.3"
default: "0.8.4"
runs:
using: composite
steps:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "gardenlinux"
version = "0.8.0"
version = "0.8.4"
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 <contact@gardenlinux.io>"]
license = "Apache-2.0"
Expand Down
11 changes: 5 additions & 6 deletions src/gardenlinux/oci/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,16 +445,15 @@ def push_manifest_and_artifacts_from_directory(
if not isinstance(manifest, Manifest):
raise RuntimeError("Artifacts image manifest given is invalid")

# Scan and extract nested artifacts
for file_path_name in artifacts_dir.glob("*.pxe.tar.gz"):
self._logger.info(f"Found nested artifact {file_path_name}")
extract_targz(file_path_name, artifacts_dir)

files = [
file_name for file_name in artifacts_dir.iterdir() if file_name.is_file()
]

# Scan and extract nested artifacts
for file_path_name in files:
if file_path_name.match("*.pxe.tar.gz"):
self._logger.info(f"Found nested artifact {file_path_name}")
extract_targz(file_path_name, artifacts_dir)

artifacts_with_metadata = Container.get_artifacts_metadata_from_files(
files, manifest.arch
)
Expand Down