Merge pull request #13658 from gitbutlerapp/blackbox-logs

Fix e2e logs path and combine blackbox test output into single flat artifact

Author: mtsgrd

.github/workflows/test-e2e.yml

@@ -80,18 +80,18 @@ jobs:
         if: ${{ github.ref != 'refs/heads/master' }}
         run: xvfb-run pnpm test:e2e:blackbox
 
-      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      - name: Flatten test results
         if: failure()
-        with:
-          name: e2e-videos
-          overwrite: true
-          path: ./e2e/blackbox/videos
+        run: |
+          mkdir -p ./e2e-output
+          find ./e2e/blackbox/videos -type f -exec cp {} ./e2e-output/ \; 2>/dev/null || true
+          find ~/.local/share/com.gitbutler.app*/logs -type f -exec cp {} ./e2e-output/ \; 2>/dev/null || true
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         if: failure()
         with:
-          name: e2e-logs
+          name: e2e-blackbox-output
           overwrite: true
-          path: ~/.config/com.gitbutler.app*/logs
+          path: ./e2e-output/
 
   playwright:
     name: e2e-playwright