ci: avoid upload failures with unique screenshot names with optional suffixes (#5404)

* ci: avoid upload failures with unique screenshot names with optional suffixes

* Fix typo

* Use fastlane command as part of the name

Author: itaybre

.github/actions/capture-screenshot/action.yml

@@ -1,5 +1,10 @@
 name: "Capture screenshot"
 description: "Captures a screenshot of the machine"
+inputs:
+  suffix:
+    description: "The suffix of the screenshot"
+    required: false
+    default: ""
 runs:
   using: "composite"
   steps:
@@ -10,5 +15,5 @@ runs:
     - name: Store screenshot
       uses: actions/upload-artifact@v4
       with:
-        name: screenshot-${{ github.job }}
+        name: screenshot-${{ github.job }}${{ inputs.suffix }}
         path: /tmp/screenshot.png

.github/workflows/ui-tests-common.yml

@@ -12,8 +12,8 @@ on:
         required: false
         default: ""
         type: string
-      xcresult_suffix:
-        description: "Suffix for the xcresult artifact (if needed)"
+      files_suffix:
+        description: "Suffix for the files to upload"
         required: false
         default: ""
         type: string
@@ -95,18 +95,20 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
-          name: ${{ inputs.fastlane_command }}${{inputs.xcresult_suffix}}
+          name: ${{ inputs.fastlane_command }}${{ inputs.files_suffix }}.xcresult
           path: fastlane/test_results/${{ inputs.fastlane_command }}.xcresult
 
       - name: Archiving Raw Test Logs
         uses: actions/upload-artifact@v4
         if: ${{ failure() || cancelled() }}
         with:
-          name: ${{ inputs.fastlane_command }}${{inputs.xcresult_suffix}}_raw_output
+          name: ${{ inputs.fastlane_command }}${{ inputs.files_suffix }}_raw_output
           path: |
             ~/Library/Logs/scan/*.log
             ./fastlane/test_output/**
 
       - name: Store screenshot
         uses: ./.github/actions/capture-screenshot
         if: failure()
+        with:
+          suffix: ${{ inputs.fastlane_command }}${{ inputs.files_suffix }}

.github/workflows/ui-tests-critical.yml

@@ -30,6 +30,7 @@ jobs:
       build_with_make: true
       xcode_version: ${{matrix.platform.xcode}}
       macos_version: ${{matrix.platform.runs-on}}
+      files_suffix: _${{matrix.platform.xcode}}
     strategy:
       fail-fast: false
       matrix:

.github/workflows/ui-tests.yml

@@ -69,7 +69,7 @@ jobs:
     with:
       fastlane_command: ui_tests_ios_swift
       fastlane_command_extra_arguments: device:"${{matrix.device}}"
-      xcresult_suffix: _xcode_${{matrix.xcode}}-${{matrix.device}}
+      files_suffix: _xcode_${{matrix.xcode}}-${{matrix.device}}
       xcode_version: ${{matrix.xcode}}
       build_with_make: true
       macos_version: ${{matrix.runs-on}}