diff --git a/.github/workflows/code_review.yml b/.github/workflows/code_review.yml index f0020df..e58f9b9 100644 --- a/.github/workflows/code_review.yml +++ b/.github/workflows/code_review.yml @@ -42,14 +42,6 @@ jobs: shouldRunAndroid: ${{ steps.setVariables.outputs.shouldRunAndroid }} shouldRunIos: ${{ steps.setVariables.outputs.shouldRunIos }} - Build: - needs: SetUp - uses: ./.github/workflows/build.yml - with: - shouldRunKmp: ${{ needs.SetUp.outputs.shouldRunKmp }} - shouldRunAndroid: ${{ needs.SetUp.outputs.shouldRunAndroid }} - shouldRunIos: ${{ needs.SetUp.outputs.shouldRunIos }} - UnitTests: needs: SetUp uses: ./.github/workflows/test.yml @@ -61,12 +53,12 @@ jobs: AllowMerge: if: always() runs-on: ubuntu-latest - needs: [ Build, UnitTests ] + needs: [ UnitTests ] steps: - run: | if [ ${{ github.event_name }} == pull_request ] && [ ${{ join(github.event.pull_request.labels.*.name) == '' }} == true ]; then exit 1 - elif [ ${{ (contains(needs.Build.result, 'failure')) }} == true ] || [ ${{ (contains(needs.UnitTests.result, 'failure')) }} == true ]; then + elif [ ${{ (contains(needs.UnitTests.result, 'failure')) }} == true ]; then exit 1 else exit 0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a1c76cf..da69e94 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: Android: - if: ${{ inputs.shouldRunKmp == 'true' && inputs.shouldRunAndroid == 'true' }} + if: ${{ inputs.shouldRunKmp == 'true' || inputs.shouldRunAndroid == 'true' }} runs-on: ubuntu-latest steps: @@ -41,7 +41,7 @@ jobs: - run: ./gradlew :androidApp:cleanTestDebugUnitTest :shared:testDebugUnitTest iOS: - if: ${{ inputs.shouldRunKmp == 'true' && inputs.shouldRunIos == 'true' }} + if: ${{ inputs.shouldRunKmp == 'true' || inputs.shouldRunIos == 'true' }} runs-on: macos-13 timeout-minutes: 60 steps: