Fix actions/upload-artifact

retyui · Aug 8, 2023 · 3b24a85 · 3b24a85
1 parent 42b35b7
commit 3b24a85
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/android-and-ios-github-actions-macos.yaml b/.github/workflows/android-and-ios-github-actions-macos.yaml
@@ -127,7 +127,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: e2e-report-${{ matrix.recipe_uuid }}
+          name: e2e-report-${{ matrix.api-level }}-${{ matrix.arch }}-${{ matrix.target }}
           path: |
             ${{ github.workspace }}/*.mp4
             ${{ github.workspace }}/*.png
@@ -137,7 +137,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: e2e-debug-logs-${{ matrix.recipe_uuid }}
+          name: e2e-debug-logs-${{ matrix.api-level }}-${{ matrix.arch }}-${{ matrix.target }}
           path: ~/.maestro/tests/**/*
 
 
@@ -186,7 +186,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: e2e-report-${{ matrix.recipe_uuid }}
+          name: e2e-report-ios
           path: |
             ${{ github.workspace }}/*.mp4
             ${{ github.workspace }}/*.png
@@ -196,5 +196,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: e2e-debug-logs-${{ matrix.recipe_uuid }}
+          name: e2e-debug-logs-ios
           path: ~/.maestro/tests/**/*
diff --git a/.github/workflows/android-buildjet-ubuntu-amd64.yaml b/.github/workflows/android-buildjet-ubuntu-amd64.yaml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       fail-fast: false
-      max-parallel: 10
+      max-parallel: 5
       matrix:
         arch: [x86, x86_64]
         # ^^^ `runs-on: buildjet-2vcpu-ubuntu-2204` doesn't support `arm64-v8a`
@@ -120,7 +120,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: e2e-report-${{ matrix.recipe_uuid }}
+          name: e2e-report-${{ matrix.api-level }}-${{ matrix.arch }}-${{ matrix.target }}
           path: |
             ${{ github.workspace }}/*.mp4
             ${{ github.workspace }}/*.png
@@ -130,5 +130,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: e2e-debug-logs-${{ matrix.recipe_uuid }}
+          name: e2e-debug-logs-${{ matrix.api-level }}-${{ matrix.arch }}-${{ matrix.target }}
           path: ~/.maestro/tests/**/*
diff --git a/.github/workflows/android-github-actions-ubuntu.yaml b/.github/workflows/android-github-actions-ubuntu.yaml
@@ -5,12 +5,12 @@ on: [push, pull_request]
 
 jobs:
   run_android_e2e:
-    timeout-minutes: 45
+    timeout-minutes: 90
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
-      max-parallel: 4
+      max-parallel: 8
       matrix:
         arch: [x86, x86_64]
         # ^^^ `runs-on: ubuntu-*` doesn't support `arm64-v8a`
@@ -102,7 +102,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: e2e-report-${{ matrix.recipe_uuid }}
+          name: e2e-report-${{ matrix.api-level }}-${{ matrix.arch }}-${{ matrix.target }}
           path: |
             ${{ github.workspace }}/*.mp4
             ${{ github.workspace }}/*.png
@@ -112,6 +112,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: e2e-debug-logs-${{ matrix.recipe_uuid }}
+          name: e2e-debug-logs-${{ matrix.api-level }}-${{ matrix.arch }}-${{ matrix.target }}
           path: ~/.maestro/tests/**/*
-