From fec5ee1827696d93f4ac8a4e3d40177006ef01e9 Mon Sep 17 00:00:00 2001 From: Irfan Alibay Date: Sun, 21 Jul 2024 01:12:22 +0100 Subject: [PATCH 1/8] Try speeding up CI --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 227ebae12..b24390ac0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -123,6 +123,8 @@ jobs: # Set the OFE_SLOW_TESTS to True if running a Cron job OFE_SLOW_TESTS: ${{ fromJSON('{"false":"false","true":"true"}')[github.event_name != 'pull_request'] }} DUECREDIT_ENABLE: 'yes' + OPENMM_CPU_THREADS: '1' + OMP_NUM_THREADS: '1' run: | pytest -n auto -v --cov=openfe --cov=openfecli --cov-report=xml --durations=10 From fd564057763372de3da6550900a6ae81c7c655c7 Mon Sep 17 00:00:00 2001 From: Irfan Alibay Date: Sun, 21 Jul 2024 01:36:40 +0100 Subject: [PATCH 2/8] Update ci.yaml --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b24390ac0..657b1bd6c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -121,7 +121,8 @@ jobs: - name: "Run tests" env: # Set the OFE_SLOW_TESTS to True if running a Cron job - OFE_SLOW_TESTS: ${{ fromJSON('{"false":"false","true":"true"}')[github.event_name != 'pull_request'] }} + # OFE_SLOW_TESTS: ${{ fromJSON('{"false":"false","true":"true"}')[github.event_name != 'pull_request'] }} + OFE_SLOW_TESTS: "true" DUECREDIT_ENABLE: 'yes' OPENMM_CPU_THREADS: '1' OMP_NUM_THREADS: '1' From fc2a060c88ee1159228cb0ba013b03c36c139d56 Mon Sep 17 00:00:00 2001 From: Irfan Alibay Date: Sun, 21 Jul 2024 04:17:11 +0100 Subject: [PATCH 3/8] Update ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 657b1bd6c..728245e9e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -127,7 +127,7 @@ jobs: OPENMM_CPU_THREADS: '1' OMP_NUM_THREADS: '1' run: | - pytest -n auto -v --cov=openfe --cov=openfecli --cov-report=xml --durations=10 + pytest -n auto -v --durations=10 - name: codecov-pr if: ${{ github.repository == 'OpenFreeEnergy/openfe' From 3aa3a74b66eb303b3a6d25da17916307a6214687 Mon Sep 17 00:00:00 2001 From: Irfan Alibay Date: Sun, 21 Jul 2024 13:59:49 +0100 Subject: [PATCH 4/8] Update ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 728245e9e..01e4503cb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -127,7 +127,7 @@ jobs: OPENMM_CPU_THREADS: '1' OMP_NUM_THREADS: '1' run: | - pytest -n auto -v --durations=10 + pytest -v --durations=10 - name: codecov-pr if: ${{ github.repository == 'OpenFreeEnergy/openfe' From 904949ea3c1d5934200d145d779e0d24afd82130 Mon Sep 17 00:00:00 2001 From: Irfan Alibay Date: Sun, 21 Jul 2024 14:42:41 +0100 Subject: [PATCH 5/8] Update ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 01e4503cb..08d08a2c3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -124,7 +124,7 @@ jobs: # OFE_SLOW_TESTS: ${{ fromJSON('{"false":"false","true":"true"}')[github.event_name != 'pull_request'] }} OFE_SLOW_TESTS: "true" DUECREDIT_ENABLE: 'yes' - OPENMM_CPU_THREADS: '1' + # OPENMM_CPU_THREADS: '1' OMP_NUM_THREADS: '1' run: | pytest -v --durations=10 From 5adb48e6368e462a68a5690cfef184c0b4a80bb9 Mon Sep 17 00:00:00 2001 From: Irfan Alibay Date: Sun, 21 Jul 2024 17:00:59 +0100 Subject: [PATCH 6/8] Update ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 08d08a2c3..a1a2041d6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -127,7 +127,7 @@ jobs: # OPENMM_CPU_THREADS: '1' OMP_NUM_THREADS: '1' run: | - pytest -v --durations=10 + pytest -n auto -v --durations=10 - name: codecov-pr if: ${{ github.repository == 'OpenFreeEnergy/openfe' From 2b60773fb1ad23d33bdf32023062b6c7affc39cf Mon Sep 17 00:00:00 2001 From: Irfan Alibay Date: Sun, 25 Aug 2024 14:03:57 +0100 Subject: [PATCH 7/8] Update ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a1a2041d6..2193a53cf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -127,7 +127,7 @@ jobs: # OPENMM_CPU_THREADS: '1' OMP_NUM_THREADS: '1' run: | - pytest -n auto -v --durations=10 + pytest -n logical -v --durations=10 - name: codecov-pr if: ${{ github.repository == 'OpenFreeEnergy/openfe' From 8281c4d0d0efafd0d4b36299cdd157c7abe3b762 Mon Sep 17 00:00:00 2001 From: IAlibay Date: Wed, 18 Sep 2024 08:33:55 +0100 Subject: [PATCH 8/8] Add a bit of extra logic --- .github/workflows/ci.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 363b2ad7b..7988381ac 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -116,12 +116,16 @@ jobs: env: # Set the OFE_SLOW_TESTS to True if running a Cron job # OFE_SLOW_TESTS: ${{ fromJSON('{"false":"false","true":"true"}')[github.event_name != 'pull_request'] }} + COVERAGE: ${{ fromJSON('{"false":"false","true":"true"}')[github.event_name == 'pull_request'] }} OFE_SLOW_TESTS: "true" DUECREDIT_ENABLE: 'yes' - # OPENMM_CPU_THREADS: '1' + OPENMM_CPU_THREADS: '1' OMP_NUM_THREADS: '1' run: | - pytest -n logical -v --durations=10 + if [ ${COVERAGE} = "true" ]; then + EXTRA_FLAGS="--cov=openfe --cov=openfecli --cov-report=xml" + fi + pytest -n logical -v --durations=10 ${EXTRA_FLAGS} - name: codecov-pr if: ${{ github.repository == 'OpenFreeEnergy/openfe'