Try cancelled

Tribler · Jul 18, 2023 · 948d6d0 · 948d6d0
1 parent 3c6a45f
commit 948d6d0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/.github/actions/env/action.yml b/.github/actions/env/action.yml
@@ -1,24 +1,24 @@
-name: exportenv
+name: env
 description: Construct env for each operating system
 runs:
   using: 'composite'
   steps:
-    - name: Common envs
-      shell: bash
+    - shell: bash
       run: |
         cat >> $GITHUB_ENV << EOF
         XDIST_ARGUMENTS=-n auto
         PYTEST_ARGUMENTS=--randomly-seed=1 --disable-warnings --reruns 1 --reruns-delay 1 --verbose --durations=3 --showlocals
         EOF
 
+    - shell: bash
+      run: |
         cat >> $GITHUB_ENV << EOF
         PYTEST_CORE_ARGUMENTS=./src/tribler/core ${PYTEST_ARGUMENTS}
         PYTEST_TUNNELS_ARGUMENTS=./src/tribler/core/components/tunnel/tests/test_full_session --tunneltests ${PYTEST_ARGUMENTS}
         PYTEST_GUI_ARGUMENTS=./src/tribler/gui --guitests ${PYTEST_ARGUMENTS}
         EOF
 
-    - name: Linux and macOS
-      if: runner.os == 'Linux'  ||  runner.os == 'macOS'
+    - if: runner.os == 'Linux'  ||  runner.os == 'macOS'
       shell: bash
       run: |
         cat >> $GITHUB_ENV << EOF
@@ -27,8 +27,7 @@ runs:
         PYTEST_GUI_ARGUMENTS=${PYTEST_GUI_ARGUMENTS} --looptime
         EOF
 
-    - name: Linux
-      if: runner.os == 'Linux'
+    - if: runner.os == 'Linux'
       shell: bash
       run: |
         cat >> $GITHUB_ENV << EOF

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -39,7 +39,7 @@ jobs:
     env:
       PYTEST_SENTRY_DSN: ${{secrets.PYTEST_SENTRY_DSN}}
 
-    timeout-minutes: 10
+    timeout-minutes: 15
 
     steps:
       - uses: actions/checkout@v3
@@ -60,8 +60,15 @@ jobs:
       - name: Export env
         uses: ./.github/actions/env
 
+      - name: Run Pytest with xdist
+        id: xdist
+        timeout-minutes: 5
+        run: |
+          pytest ${PYTEST_CORE_ARGUMENTS} ${XDIST_ARGUMENTS}
+          pytest ${PYTEST_TUNNELS_ARGUMENTS} ${XDIST_ARGUMENTS}
+
       - name: Run Pytest
-        if: runner.os == 'macOS'
+        if: ${{ failure() && steps.xdist.conclusion == 'cancelled' }}
         run: |
-          pytest ${PYTEST_CORE_ARGUMENTS}
-          pytest ${PYTEST_TUNNELS_ARGUMENTS}
+          pytest ${PYTEST_CORE_ARGUMENTS} 
+          pytest ${PYTEST_TUNNELS_ARGUMENTS}