Update tests to fix duplicate name issues

aws-amplify · Oct 4, 2023 · 7453bb8 · 7453bb8
1 parent 513e6c8
commit 7453bb8
Show file tree

Hide file tree

Showing 11 changed files with 149 additions and 118 deletions.
diff --git a/.github/composite_actions/log_cw_metric/dist/main.cjs b/.github/composite_actions/log_cw_metric/dist/main.cjs
diff --git a/.github/composite_actions/log_cw_metric/dist/main.cjs.map b/.github/composite_actions/log_cw_metric/dist/main.cjs.map
diff --git a/.github/workflows/e2e_android.yaml b/.github/workflows/e2e_android.yaml
@@ -16,7 +16,7 @@ on:
         type: boolean
 
 jobs:
-  e2e-test:
+  e2e-android-test:
     runs-on: ubuntu-latest
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
@@ -16,7 +16,7 @@ on:
         type: boolean
 
 jobs:
-  e2e-test:
+  e2e-test-ios:
     runs-on: macos-latest
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

diff --git a/.github/workflows/e2e_linux.yaml b/.github/workflows/e2e_linux.yaml
@@ -16,7 +16,7 @@ on:
         type: boolean
 
 jobs:
-  e2e-test:
+  e2e-test-linux:
     runs-on:
       labels: ubuntu-latest
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.

diff --git a/.github/workflows/e2e_web.yaml b/.github/workflows/e2e_web.yaml
@@ -16,7 +16,7 @@ on:
         type: boolean
 
 jobs:
-  e2e-test:
+  e2e-test-web:
     runs-on:
       labels: ubuntu-latest
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.

diff --git a/.github/workflows/e2e_windows.yaml b/.github/workflows/e2e_windows.yaml
@@ -16,7 +16,7 @@ on:
         type: boolean
 
 jobs:
-  e2e-test:
+  e2e-test-windows:
     runs-on:
       labels: windows-latest
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.

diff --git a/.github/workflows/flutter_android.yaml b/.github/workflows/flutter_android.yaml
@@ -17,7 +17,7 @@ on:
         type: boolean
 
 jobs:
-  test:
+  test-flutter_android:
     name: Build and Test
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -69,7 +69,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
           test-type: unit
-          working-directory: ${{ inputs.working-directory }}
+          working-directory: ${{ inputs.example-directory }}
 
           framework: flutter
           flutter-dart-channel: ${{ matrix.channel }}

diff --git a/.github/workflows/flutter_ios.yaml b/.github/workflows/flutter_ios.yaml
@@ -17,7 +17,7 @@ on:
         type: boolean
 
 jobs:
-  test:
+  test-flutter_ios:
     name: Build and Test
     runs-on: macos-latest-xl
     timeout-minutes: 30
@@ -75,7 +75,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
           test-type: unit
-          working-directory: ${{ inputs.working-directory }}
+          working-directory: ${{ inputs.example-directory }}
 
           framework: flutter
           flutter-dart-channel: ${{ matrix.channel }}

diff --git a/.github/workflows/flutter_vm.yaml b/.github/workflows/flutter_vm.yaml
@@ -16,7 +16,7 @@ on:
         type: boolean
 
 jobs:
-  test:
+  test-flutter_vm:
     name: Test
     runs-on: ${{ inputs.has-goldens && 'macos-latest' || 'ubuntu-latest' }}
     timeout-minutes: 60

diff --git a/actions/bin/log_cw_metric.dart b/actions/bin/log_cw_metric.dart
@@ -38,7 +38,7 @@ Future<void> logMetric() async {
 
   final matrixValues = parseMatrixInput(matrixRawInput);
   final jobIdentifier =
-      '${github.context.workflow} / ${github.context.job} ${matrixValues == null ? '' : '($matrixValues)'}';
+      '${github.context.job} ${matrixValues == null ? '' : '($matrixValues)'}';
 
   core.info('Job identifier: $jobIdentifier');
 
@@ -164,6 +164,8 @@ Future<String> getFailingStep(
   String runId,
 ) async {
   try {
+    jobIdentifier = jobIdentifier.toLowerCase();
+
     final headers = {
       'Authorization': 'token $githubToken',
       'Accept': 'application/vnd.github.v3+json',
@@ -181,8 +183,10 @@ Future<String> getFailingStep(
 
     print('response successfully parsed to a jobsList');
 
-    final matchingJob =
-        jobsList.jobs.firstWhere((job) => job.name.contains(jobIdentifier));
+    final matchingJob = jobsList.jobs.firstWhere(
+        (job) => job.name.toLowerCase().contains(jobIdentifier),
+        orElse: () => throw Exception(
+            'No job found matching $jobIdentifier.  Ensure full workflow path run name is unique.  Available jobs: ${jobsList.jobs.map((e) => e.name).join(', ')}'));
     final steps = matchingJob.steps;
     core.info('steps $steps');