diff --git a/.github/workflows/EVENT_merge_to_master.yml b/.github/workflows/EVENT_merge_to_master.yml index 1e3326249..418ec6e54 100644 --- a/.github/workflows/EVENT_merge_to_master.yml +++ b/.github/workflows/EVENT_merge_to_master.yml @@ -9,18 +9,18 @@ on: permissions: contents: read - id-token: write # Necessary for the generate documentation job - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + id-token: write # Necessary for the generate documentation job jobs: - run_tests: name: Run tests uses: ./.github/workflows/JOB_tests.yml + e2e_tests: + name: E2E Tests + uses: ./.github/workflows/JOB_e2e.yml + secrets: inherit + documentation: name: Documentation uses: ./.github/workflows/JOB_generate_documentation.yml @@ -30,18 +30,18 @@ jobs: contents: read warn_on_fail: - needs: [run_tests, documentation] + needs: [run_tests, e2e_tests, documentation] if: ${{ failure() }} name: Slack message us on fail uses: ./.github/workflows/JOB_slack_message.yml secrets: inherit with: at_team: true - icon: ':warning:' - message: 'Master is failing after a push event, please review at ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}' + icon: ":warning:" + message: "Master is failing after a push event, please review at ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}" success: - needs: [run_tests, documentation] + needs: [run_tests, e2e_tests, documentation] if: ${{ success() }} name: Success runs-on: ubuntu-latest @@ -64,4 +64,4 @@ jobs: repo: context.repo.repo, sha: context.sha, state: 'success' - }) \ No newline at end of file + }) diff --git a/.github/workflows/JOB_tests.yml b/.github/workflows/JOB_tests.yml index 5fcfbc67e..0970d8cc6 100644 --- a/.github/workflows/JOB_tests.yml +++ b/.github/workflows/JOB_tests.yml @@ -4,6 +4,8 @@ run-name: Tests on: workflow_call: + pull_request: + branches: [main, master] permissions: contents: read @@ -48,7 +50,7 @@ jobs: pip install wheel && \ pip install --upgrade setuptools && \ pip install --editable '.[test,ml,medical,dev, ocv]'" - + - name: Install ffmpeg (Ubuntu) if: matrix.os == 'ubuntu-latest' shell: bash