From c375cdbb1ae84faedc142eadf11ca5a63332bdfe Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 8 Mar 2026 18:03:01 +0100
Subject: [PATCH] CI: Upload artifact files directly (#6654)

* Upload artifact files directly

* match pdbs name

* Update name variable
---
 .ci/name_build.sh                   | 10 +++++-----
 .github/workflows/desktop-build.yml |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.ci/name_build.sh b/.ci/name_build.sh
index 060f8a68e..7b964e21c 100755
--- a/.ci/name_build.sh
+++ b/.ci/name_build.sh
@@ -35,15 +35,15 @@ if ! cd "$path"; then
 fi
 
 # set filename
-name="${file%.*}" # remove all after last .
-new_name="$name$SUFFIX."
+name="${file%.*}" # remove file extension
+new_name="$name$SUFFIX"
 if [[ $MAKE_ZIP ]]; then
-  filename="${new_name}zip"
+  filename="${new_name}.zip"
   echo "creating zip '$filename' from '$file'"
   zip "$filename" "$file"
 else
   extension="${file##*.}" # remove all before last .
-  filename="$new_name$extension"
+  filename="$new_name.$extension"
   echo "renaming '$file' to '$filename'"
   mv "$file" "$filename"
 fi
@@ -52,4 +52,4 @@ cd "$oldpwd"
 relative_path="$path/$filename"
 ls -l "$relative_path"
 echo "path=$relative_path" >>"$GITHUB_OUTPUT"
-echo "name=$filename" >>"$GITHUB_OUTPUT"
+echo "name=$new_name" >>"$GITHUB_OUTPUT"
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 2cd25fc32..bc49db2da 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -214,8 +214,8 @@ jobs:
         if: matrix.package != 'skip'
         uses: actions/upload-artifact@v7
         with:
-          name: ${{matrix.distro}}${{matrix.version}}-package
           path: ${{steps.build.outputs.path}}
+          archive: false
           if-no-files-found: error
 
       - name: Upload to release
@@ -501,15 +501,15 @@ jobs:
         if: matrix.make_package
         uses: actions/upload-artifact@v7
         with:
-          name: ${{matrix.artifact_name}}
           path: ${{steps.build.outputs.path}}
+          archive: false
           if-no-files-found: error
 
       - name: Upload PDBs (Program Databases)
         if: matrix.os == 'Windows'
         uses: actions/upload-artifact@v7
         with:
-          name: Windows${{matrix.target}}-PDBs
+          name: ${{steps.build.outputs.name}}-PDBs
           path: |
             build/cockatrice/Release/*.pdb
             build/oracle/Release/*.pdb