From 3dd2e77ca402106b5f56ee93465d9958a2b8f886 Mon Sep 17 00:00:00 2001
From: Martin Bubel <martin.bubel@itwm.fraunhofer.de>
Date: Sun, 14 Jan 2024 23:29:42 +0100
Subject: [PATCH] github-actions: try moving files directly

---
 .github/workflows/test-and-deploy.yml | 32 +++++++++------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
index 55b6aaf9..66031525 100644
--- a/.github/workflows/test-and-deploy.yml
+++ b/.github/workflows/test-and-deploy.yml
@@ -130,11 +130,6 @@ jobs:
           name: dist-artifacts-${{ matrix.os }}-${{ matrix.python }}
           path: dist
 
-      # Output the artifact name for later use
-      - name: Set output
-        id: set_output
-        run: echo "dist-artifacts-${{ matrix.os }}-${{ matrix.python }}" >> $GITHUB_ENV
-
   build-macos:
     strategy:
       matrix:
@@ -166,11 +161,6 @@ jobs:
           name: dist-artifacts-${{ matrix.os }}-${{ matrix.python }}
           path: dist/*
 
-      # Output the artifact name for later use
-      - name: Set output
-        id: set_output
-        run: printf "dist-artifacts-${{ matrix.os }}-${{ matrix.python }}" >> $GITHUB_ENV
-
   build-linux:
     strategy:
         matrix:
@@ -220,11 +210,6 @@ jobs:
           name: dist-artifacts-manylinux-${{ matrix.python }}
           path: dist/*
 
-      # Output the artifact name for later use
-      - name: Set output
-        id: set_output
-        run: printf "dist-artifacts-manylinux-${{ matrix.python }}" >> $GITHUB_ENV
-
   deploy:
     runs-on: ubuntu-latest
     needs: [test-windows, test-linux, test-macos, build-linux, build-windows, build-macos]
@@ -247,14 +232,17 @@ jobs:
         with:
           path: dist
 
-      - name: Get artifact names
-        run: |
-          # Read the artifact_name output from the build job
-          ARTIFACT_NAME=$(grep 'artifact_name=' $GITHUB_ENV | cut -d= -f2)
+      - name: Create dist directory
+        run: mkdir -p dist
 
-          # Download artifacts without additional subdirectories
-          mkdir -p dist
-          mv dist/$ARTIFACT_NAME/* dist/
+      - name: Move files from subdirectories
+        run: |
+          for subdirectory in dist/*/; do
+            dir_name=$(basename "$subdirectory")
+            mv "$subdirectory"* dist/
+            rm -r "$subdirectory"
+            echo "Moved files from '$dir_name' to 'dist/'"
+          done
 
       - name: Inspect wheel files
         run: |