diff --git a/.github/workflows/build_amplify_swift_for_testing.yml b/.github/workflows/build_amplify_swift_for_testing.yml index f606d2ac9b..df21a33611 100644 --- a/.github/workflows/build_amplify_swift_for_testing.yml +++ b/.github/workflows/build_amplify_swift_for_testing.yml @@ -19,7 +19,7 @@ concurrency: cancel-in-progress: ${{ github.ref_name != 'main'}} jobs: - build-amplify-swift-iOS: + build-for-testing-amplify-swift-iOS: runs-on: macos-13 timeout-minutes: 20 steps: @@ -65,7 +65,7 @@ jobs: path: ~/Library/Developer/Xcode/DerivedData/Amplify key: ${{ steps.cache-packages.outputs.cache-primary-key }} - build-amplify-swift-macOS: + build-for-testing-amplify-swift-macOS: runs-on: macos-13 timeout-minutes: 20 steps: @@ -99,7 +99,7 @@ jobs: path: ~/Library/Developer/Xcode/DerivedData/Amplify key: ${{ steps.cache-packages.outputs.cache-primary-key }} - build-amplify-swift-tvOS: + build-for-testing-amplify-swift-tvOS: runs-on: macos-13 timeout-minutes: 20 steps: @@ -133,7 +133,7 @@ jobs: path: ~/Library/Developer/Xcode/DerivedData/Amplify key: ${{ steps.cache-packages.outputs.cache-primary-key }} - build-amplify-swift-watchOS: + build-for-testing-amplify-swift-watchOS: runs-on: macos-13 timeout-minutes: 20 steps: @@ -166,18 +166,3 @@ jobs: with: path: ~/Library/Developer/Xcode/DerivedData/Amplify key: ${{ steps.cache-packages.outputs.cache-primary-key }} - - confirm-pass: - runs-on: ubuntu-latest - name: Confirm Passing Build Steps - if: ${{ !cancelled() }} - needs: [ - build-amplify-swift-iOS, - build-amplify-swift-macOS, - build-amplify-swift-tvOS, - build-amplify-swift-watchOS - ] - env: - EXIT_CODE: ${{ contains(needs.*.result, 'failure') && 1 || 0 }} - steps: - - run: exit $EXIT_CODE diff --git a/.github/workflows/run_xcodebuild_test_platforms.yml b/.github/workflows/run_xcodebuild_test_platforms.yml index aa6f0ddab9..f04193a2b8 100644 --- a/.github/workflows/run_xcodebuild_test_platforms.yml +++ b/.github/workflows/run_xcodebuild_test_platforms.yml @@ -76,7 +76,7 @@ jobs: cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify derived_data_path: ${{ github.workspace }}/Build disable_package_resolution: ${{ steps.cache-packages.outputs.cache-hit }} - test_without_building: ${{ steps.restore-amplify-build.outputs.cache-hit || steps.restore-build.outputs.cache-hit }} + test_without_building: ${{ steps.restore-build.outputs.cache-hit }} other_flags: ${{ inputs.other_flags }} - name: Retry iOS Test Suite if needed if: inputs.retry_on_error == true && steps.run-tests.outcome=='failure' diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index 06ef885e6e..e7678b69d0 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -7,10 +7,10 @@ on: type: string workflow_dispatch: - # push: - # branches-ignore: - # - main - # - release + push: + branches-ignore: + - main + - release permissions: contents: read