Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e311bf1 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

removed code

parent b04da20e
Loading
Loading
Loading
Loading
+0 −13
Original line number Diff line number Diff line
@@ -43,11 +43,7 @@ jobs:
      run: composer run test
    - name: Upload coverage to Codecov
      if: ${{ matrix.nextcloud-versions == 'master' }}
<<<<<<< HEAD
      uses: codecov/codecov-action@v3
=======
      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3
>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4
      with:
        token: ${{ secrets.CODECOV_TOKEN }}
        file: nextcloud/apps/calendar/clover.unit.xml
@@ -55,8 +51,6 @@ jobs:
        fail_ci_if_error: true
        verbose: true

<<<<<<< HEAD
=======
  integration-tests:
    runs-on: ubuntu-latest
    strategy:
@@ -101,15 +95,11 @@ jobs:
        working-directory: nextcloud/apps/calendar
        run: composer run test:integration

>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4
  summary:
    runs-on: ubuntu-latest
    needs:
      - unit-tests
<<<<<<< HEAD
=======
      - integration-tests
>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4

    if: always()

@@ -118,9 +108,6 @@ jobs:
    steps:
      - name: Unit test status
        run: if ${{ needs.unit-tests.result != 'success' && needs.unit-tests.result != 'skipped' }}; then exit 1; fi
<<<<<<< HEAD
=======
      - name: Integration test status
        run: if ${{ needs.integration-tests.result != 'success' && needs.integration-tests.result != 'skipped' }}; then exit 1; fi
>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4