Editing GH workflows

Author: mathieulemieux

.github/workflows/extended-tests-integration.yml

@@ -1,15 +1,25 @@
-# Extended testing using Python 3.9, 3.10, 3.11 & 3.12 INCLUDING integration tests
-# Triggered by a pull request to main branch created
-# Triggered by a pull request to main branch updated by a new commit
-# Triggered by a pull request to main branch converted from drat to regular (non-draft)
-# EXCEPTION for draft pull request: EXCLUDING integration tests, upload test results & code cov.
+# Extended testing, INCLUDDING integration tests
+# Python:
+#   - 3.9
+#   - 3.10
+#   - 3.11
+#   - 3.12
+# Triggered by:
+#   - Creating a new PR to main branch
+#   - Addind commit(s) to an existing PR to main branch
+#   - Addind commit(s) to main branch:
+#     - Direct commit without PR
+#     - Updating the out-of-date base branch to an existing PR to main branch
 
 name: extended-tests-integration
 
 on:
+  push:
+    branches: [main]
   pull_request:
     branches: [main]
-    types: [opened, synchronize, ready_for_review]
+    types: [opened, synchronize]
+  workflow_dispatch:
 
 jobs:
 
@@ -44,19 +54,6 @@ jobs:
         black --check -S -l 100 pori_python tests
 
     - name: Tests with pytest, including integration tests
-      if: ${{ github.event.pull_request.draft == true }}
-      run: |
-        pip list
-        pytest --junitxml=junit/test-results-${{ matrix.python-version }}.xml --cov pori_python --cov-report term --cov-report xml
-      env:
-        IPR_USER: ${{ secrets.IPR_TEST_USER }}
-        IPR_PASS: ${{ secrets.IPR_TEST_PASSWORD }}
-        GRAPHKB_USER: ${{ secrets.GKB_TEST_USER }}
-        GRAPHKB_PASS: ${{ secrets.GKB_TEST_PASS }}
-        EXCLUDE_INTEGRATION_TESTS: 1
-
-    - name: Tests with pytest, including integration tests
-      if: ${{ github.event.pull_request.draft == false }}
       run: |
         pip list
         pytest --junitxml=junit/test-results-${{ matrix.python-version }}.xml --cov pori_python --cov-report term --cov-report xml
@@ -68,21 +65,15 @@ jobs:
         EXCLUDE_INTEGRATION_TESTS: 0
 
     - name: Upload pytest test results
-      if: ${{ (
-        github.event.pull_request.draft == false &&
-        matrix.python-version == '3.9'
-      ) }}
+      if: ${{ matrix.python-version == '3.9' }}
       uses: actions/upload-artifact@v4
       with:
         name: pytest-results-${{ matrix.python-version }}
         path: junit/test-results-${{ matrix.python-version }}.xml
         # Use always() to always run this step to publish test results when there are test failures
 
     - name: Update code coverage report to CodeCov
-      if: ${{ (
-        github.event.pull_request.draft == false &&
-        matrix.python-version == '3.9'
-      ) }}
+      if: ${{ matrix.python-version == '3.9' }}
       uses: codecov/codecov-action@v5
       with:
         token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/pytest.yml

@@ -1,19 +1,26 @@
-# Limited testing using Python 3.9 only INCLUDING integration tests
-# Triggered by a regular (non-draft) pull request created, except to main branch
-# Triggered by a regular (non-draft) pull request updated by a new commit, except to main branch
-# Triggered by a draft pull request to develop branch converted into a regular (non-draft) one
+# Limited testing, INCLUDING integration tests
+# Python:
+#   - 3.9
+# Triggered by:
+#   - Creating a new PR to develop branch
+#   - Addind commit(s) to an existing PR to develop branch
+#   - Addind commit(s) to develop branch:
+#     - Direct commit without PR
+#     - Updating the out-of-date base branch to an existing PR to develop branch
 
 name: quick-tests-integration
 
 on:
+  push:
+    branches: [develop]
   pull_request:
     branches: [develop]
-    types: [opened, synchronize, ready_for_review]
+    types: [opened, synchronize]
+  workflow_dispatch:
 
 jobs:
 
   quick-tests-integration:
-    if: ${{ github.event.pull_request.draft == false }}
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository

.github/workflows/quick-pytest.yml

@@ -1,18 +1,25 @@
-# Limited testing using Python 3.9 only EXCLUDING integration tests
-# Triggered by any push (new branch, or new commit to any branch), EXCEPT
-# if that branch is part of a regular (non-draft) pull request
+# Limited testing, EXCLUDING integration tests
+# Python:
+#   - 3.9
+# Triggered by:
+#   - Pushing a new branch
+#   - Addind commit(s) to a branch that is not main or develop, and that is not part of a PR to develop or main branch
 
 name: quick-tests
 
 on:
   push:
+    branches-ignore: [main, develop]
+  workflow_dispatch:
 
 jobs:
 
   quick-tests:
     if: ${{ !(
-      github.event.pull_request &&
-      github.event.pull_request.draft == false
+      github.event.pull_request && (
+        github.event.pull_request.base.ref == 'main' ||
+        github.event.pull_request.base.ref == 'develop'
+      )
     ) }}
     runs-on: ubuntu-latest
     steps: