From 82fbf774e09f06b9f5975d1bbd09cf41ea5b5a44 Mon Sep 17 00:00:00 2001
From: Christian Cwienk <christian.cwienk@sap.com>
Date: Thu, 10 Oct 2024 11:27:59 +0200
Subject: [PATCH] fix package-build for gardener-ci-cli

---
 .github/workflows/build-and-test.yaml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 0c65a8e08..af5600df9 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -117,13 +117,14 @@ jobs:
         version=${{ needs.version.outputs.setuptools_version }}
         echo "version: ${version}"
         echo "${version}" | .ci/write-version
-        pkg_dir="dist"
+        pkg_dir=dist
         mkdir -p ${pkg_dir}
+        pkg_dir="$(readlink -f dist)"
+        echo "pkgdir: ${pkg_dir}"
         for path in \
           setup.py \
           setup.oci.py \
           setup.whd.py \
-          cli/setup.py \
         ; do
          echo "building distribution package from ${path}"
          python3 ${path} \
@@ -131,6 +132,16 @@ jobs:
             bdist_wheel \
             --dist-dir ${pkg_dir}
         done
+
+        # special-case: cli-package (need to chdir in order to not confuse setuptools)
+        (
+          cd cli
+          python3 setup.py \
+            sdist \
+            bdist_wheel \
+            --dist-dir ${pkg_dir}
+        )
+
         echo "Built packages"
         ls "${pkg_dir}"
         blobs_dir="${pkg_dir}/blobs.d"