From 9f281a8eb30d6ec0fe6cf7cb87c84e21de855c18 Mon Sep 17 00:00:00 2001 From: Mike Henry <11765982+mikemhenry@users.noreply.github.com> Date: Thu, 16 Nov 2023 13:17:12 -0700 Subject: [PATCH 1/6] test empty commit to check if there are CI problems From 81cd9b4c60fc556dc103bc2a71edef2159e93347 Mon Sep 17 00:00:00 2001 From: Mike Henry <11765982+mikemhenry@users.noreply.github.com> Date: Thu, 16 Nov 2023 14:28:20 -0700 Subject: [PATCH 2/6] new flags so that we don't mix coverage from slow tests --- .github/workflows/ci.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a821704a1..d00369895 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -83,7 +83,7 @@ jobs: run: | pytest -n auto -v --cov=openfe --cov=openfecli --cov-report=xml --durations=10 - - name: codecov + - name: codecov-pr if: ${{ github.repository == 'OpenFreeEnergy/openfe' && github.event_name == 'pull_request' }} uses: codecov/codecov-action@v3 @@ -92,3 +92,15 @@ jobs: file: coverage.xml fail_ci_if_error: False verbose: True + flags: fast-tests + + - name: codecov-schedule + if: ${{ github.repository == 'OpenFreeEnergy/openfe' + && github.event_name == 'schedule' }} + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: coverage.xml + fail_ci_if_error: False + verbose: True + flags: slow-tests From 7921515fabbe9f78d59d4ded09e7f5376945243d Mon Sep 17 00:00:00 2001 From: Mike Henry <11765982+mikemhenry@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:45:58 -0700 Subject: [PATCH 3/6] swap the order we test the packages in, fixes issue #610 --- .github/workflows/docker-cron.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-cron.yaml b/.github/workflows/docker-cron.yaml index 1ceb5e1bd..44b024235 100644 --- a/.github/workflows/docker-cron.yaml +++ b/.github/workflows/docker-cron.yaml @@ -90,4 +90,4 @@ jobs: docker run --rm ${{ steps.fqirp.outputs.FQIRP }} openfe --version docker run --rm ${{ steps.fqirp.outputs.FQIRP }} python -c "import gufe; print(gufe.__version__)" docker run --rm ${{ steps.fqirp.outputs.FQIRP }} pytest --pyargs gufe -v - docker run --rm ${{ steps.fqirp.outputs.FQIRP }} pytest --pyargs openfecli --pyargs openfe -v + docker run --rm ${{ steps.fqirp.outputs.FQIRP }} pytest --pyargs openfe --pyargs openfecli -v From 77c6aa24883879983b49fd45a1e622f353f93f4b Mon Sep 17 00:00:00 2001 From: Mike Henry <11765982+mikemhenry@users.noreply.github.com> Date: Fri, 17 Nov 2023 07:08:11 -0700 Subject: [PATCH 4/6] added feedback from @IAlibay --- .github/workflows/ci.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d00369895..5483379a7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -95,8 +95,9 @@ jobs: flags: fast-tests - name: codecov-schedule - if: ${{ github.repository == 'OpenFreeEnergy/openfe' - && github.event_name == 'schedule' }} + if: ${{ github.repository == 'OpenFreeEnergy/openfe' # we only want to upload a slow report if + && github.event_name != 'schedule' # 1) it isn't a schedule run + && github.event_name != 'pull_request' }} # 2) it wasn't from a PR (we don't run slow tests on PRs) uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} From ed2a35bae2cf6a2817813797168e1c394a9564ea Mon Sep 17 00:00:00 2001 From: Mike Henry <11765982+mikemhenry@users.noreply.github.com> Date: Fri, 17 Nov 2023 13:11:07 -0700 Subject: [PATCH 5/6] Update ci.yaml Co-authored-by: Irfan Alibay --- .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 5483379a7..9f06672c2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -94,7 +94,7 @@ jobs: verbose: True flags: fast-tests - - name: codecov-schedule + - name: codecov-merge if: ${{ github.repository == 'OpenFreeEnergy/openfe' # we only want to upload a slow report if && github.event_name != 'schedule' # 1) it isn't a schedule run && github.event_name != 'pull_request' }} # 2) it wasn't from a PR (we don't run slow tests on PRs) From d011065d33f1b82d1dd74ad4e1f97a99f0e79580 Mon Sep 17 00:00:00 2001 From: Mike Henry <11765982+mikemhenry@users.noreply.github.com> Date: Mon, 20 Nov 2023 08:57:40 -0700 Subject: [PATCH 6/6] fix syntax issue --- .github/workflows/ci.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9f06672c2..d2b1fa6d2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -95,9 +95,12 @@ jobs: flags: fast-tests - name: codecov-merge - if: ${{ github.repository == 'OpenFreeEnergy/openfe' # we only want to upload a slow report if - && github.event_name != 'schedule' # 1) it isn't a schedule run - && github.event_name != 'pull_request' }} # 2) it wasn't from a PR (we don't run slow tests on PRs) + # we only want to upload a slow report if + # 1) it isn't a schedule run + # 2) it wasn't from a PR (we don't run slow tests on PRs) + if: ${{ github.repository == 'OpenFreeEnergy/openfe' + && github.event_name != 'schedule' + && github.event_name != 'pull_request' }} uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }}