Merge branch 'master' into tooomm-patch-2

.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"

.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
@@ -232,7 +232,7 @@ jobs:
       - name: Attest binary provenance
         id: attestation
         if: steps.upload_release.outcome == 'success'
-        uses: actions/attest-build-provenance@v4
+        uses: actions/attest@v4
         with:
           subject-name: ${{steps.build.outputs.name}}
           subject-path: ${{steps.build.outputs.path}}
@@ -502,15 +502,15 @@ jobs:
         id: upload_artifact
         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' && github.ref_type != 'tag'
         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
@@ -531,7 +531,7 @@ jobs:
       - name: Attest binary provenance
         if: steps.upload_release.outcome == 'success'
         id: attestation
-        uses: actions/attest-build-provenance@v4
+        uses: actions/attest@v4
         with:
           subject-name: ${{steps.build.outputs.name}}
           subject-path: ${{steps.build.outputs.path}}