chore: Fixing GitHub workflows (#3538) [skip ci]

aws-amplify · Feb 23, 2024 · 5ddf98c · 5ddf98c
1 parent dc86406
commit 5ddf98c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/integ_test.yml b/.github/workflows/integ_test.yml
@@ -1,4 +1,4 @@
-name: Integration Tests
+name: Integration Tests (Except DataStore & API)
 on:
   workflow_dispatch:
   push:

diff --git a/.github/workflows/nightly_repeated_unittest.yml b/.github/workflows/nightly_repeated_unittest.yml
@@ -37,5 +37,4 @@ jobs:
       scheme: ${{ matrix.scheme }}
       timeout-minutes: 50
       generate_coverage_report: false
-      retry_on_error: false
-      other_flags: -test-iterations 100 -run-tests-until-failure
+      test_iterations_flags: -test-iterations 100 -run-tests-until-failure
diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml
@@ -27,6 +27,11 @@ on:
         required: false
         type: boolean
         default: false
+      test_iterations_flags:
+        description: 'The xcodebuild flags used when running the test. Defaults to retrying on failure up to 3 times'
+        required: false
+        type: string
+        default: '-test-iterations 3 -retry-tests-on-failure'
 
 permissions:
     contents: read
@@ -82,7 +87,7 @@ jobs:
           cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify
           derived_data_path: ${{ github.workspace }}/Build
           disable_package_resolution: ${{ steps.dependencies-cache.outputs.cache-hit }}
-          other_flags: -test-iterations 3 -retry-tests-on-failure
+          other_flags: ${{ inputs.test_iterations_flags }}
 
       - name: Retry ${{ inputs.platform }} Unit Tests
         if: steps.run-tests.outcome=='failure'
@@ -98,7 +103,7 @@ jobs:
           cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify
           derived_data_path: ${{ github.workspace }}/Build
           disable_package_resolution: true
-          other_flags: -test-iterations 3 -retry-tests-on-failure
+          other_flags: ${{ inputs.test_iterations_flags }}
 
       - name: Store Coverage Report File
         if: ${{ inputs.generate_coverage_report == true }}

diff --git a/.github/workflows/run_unit_tests_platforms.yml b/.github/workflows/run_unit_tests_platforms.yml
@@ -16,6 +16,11 @@ on:
         required: false
         type: boolean
         default: false
+      test_iterations_flags:
+        description: 'The xcodebuild flags used when running the test. Defaults to retrying on failure up to 3 times'
+        required: false
+        type: string
+        default: '-test-iterations 3 -retry-tests-on-failure'
 
 permissions:
     contents: read
@@ -37,4 +42,5 @@ jobs:
       scheme: ${{ inputs.scheme }}
       platform: ${{ matrix.platform }}
       generate_coverage_report: ${{ github.event_name != 'workflow_dispatch' && matrix.platform == 'iOS' && inputs.generate_coverage_report }}
-      timeout-minutes: ${{ inputs.timeout-minutes }}
+      timeout-minutes: ${{ inputs.timeout-minutes }}
+      test_iterations_flags: ${{ inputs.test_iterations_flags }}
diff --git a/AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/project.pbxproj b/AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/project.pbxproj
@@ -3554,7 +3554,7 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/mattgallagher/CwlPreconditionTesting.git";
 			requirement = {
-				kind = upToNextMinorVersion;
+				kind = upToNextMajorVersion;
 				minimumVersion = 2.1.0;
 			};
 		};