Merge branch 'develop' into valgrind_supps

AMICI-dev · Dec 3, 2023 · c30156d · c30156d
2 parents 59675cc + dff4ec3
commit c30156d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/deploy_branch.yml b/.github/workflows/deploy_branch.yml
@@ -1,5 +1,5 @@
 name: Deploy Branch
-on: [push, merge_group, workflow_dispatch]
+on: [push, pull_request, merge_group, workflow_dispatch]
 
 jobs:
   sdist:

diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml
@@ -1,5 +1,5 @@
 name: Installation
-on: [push, merge_group, workflow_dispatch]
+on: [push, pull_request, merge_group, workflow_dispatch]
 
 jobs:
   archive:

diff --git a/.github/workflows/test_petab_test_suite.yml b/.github/workflows/test_petab_test_suite.yml
@@ -85,6 +85,7 @@ jobs:
             tests/petab_test_suite/
 
       - name: Codecov
+        if: github.event_name == 'pull_request' || github.repository_owner == 'AMICI-dev'
         uses: codecov/[email protected]
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/.github/workflows/test_python_cplusplus.yml b/.github/workflows/test_python_cplusplus.yml
@@ -6,6 +6,7 @@ on:
   pull_request:
     branches:
       - master
+      - develop
 
 jobs:
   ubuntu-cpp-python-tests:
@@ -65,6 +66,7 @@ jobs:
           ${AMICI_DIR}/python/tests/test_splines.py
 
     - name: Codecov Python
+      if: github.event_name == 'pull_request' || github.repository_owner == 'AMICI-dev'
       uses: codecov/[email protected]
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -84,6 +86,7 @@ jobs:
         && lcov -a coverage_cpp.info -a coverage_py.info -o coverage.info
 
     - name: Codecov CPP
+      if: github.event_name == 'pull_request' || github.repository_owner == 'AMICI-dev'
       uses: codecov/[email protected]
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -92,6 +95,7 @@ jobs:
         fail_ci_if_error: true
 
     - name: Run sonar-scanner
+      if: ${{ env.SONAR_TOKEN != '' }}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -137,6 +141,7 @@ jobs:
           ${AMICI_DIR}/python/tests/test_splines_short.py
 
     - name: Codecov Python
+      if: github.event_name == 'pull_request' || github.repository_owner == 'AMICI-dev'
       uses: codecov/[email protected]
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -156,6 +161,7 @@ jobs:
         && lcov -a coverage_cpp.info -a coverage_py.info -o coverage.info
 
     - name: Codecov CPP
+      if: github.event_name == 'pull_request' || github.repository_owner == 'AMICI-dev'
       uses: codecov/[email protected]
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -164,6 +170,7 @@ jobs:
         fail_ci_if_error: true
 
     - name: Run sonar-scanner
+      if: ${{ env.SONAR_TOKEN != '' }}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

diff --git a/.github/workflows/test_sbml_semantic_test_suite.yml b/.github/workflows/test_sbml_semantic_test_suite.yml
@@ -54,6 +54,7 @@ jobs:
         path: tests/amici-semantic-results
 
     - name: Codecov SBMLSuite
+      if: github.event_name == 'pull_request' || github.repository_owner == 'AMICI-dev'
       uses: codecov/[email protected]
       with:
         token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml
@@ -7,6 +7,7 @@ on:
     - cron:  '48 4 * * *'
   pull_request:
     branches:
+      - develop
       - master
 
 jobs:
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ on: @@
         - cron:  '48 4 * * *'
       pull_request:
         branches:
+          - develop
           - master
     jobs:
@@ Expand Down @@