Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix docker image building + CI improvements #641

Merged
merged 9 commits into from
Nov 20, 2023

Conversation

mikemhenry
Copy link
Contributor

@mikemhenry mikemhenry commented Nov 16, 2023

Developers certificate of origin

Fixes #610

@mikemhenry mikemhenry changed the title test empty commit to check if there are CI problems Fix docker image building Nov 16, 2023
Copy link

codecov bot commented Nov 16, 2023

Codecov Report

Attention: 116 lines in your changes are missing coverage. Please review.

Comparison is base (7a39491) 92.21% compared to head (d011065) 90.97%.
Report is 8 commits behind head on main.

Files Patch % Lines
openfe/tests/protocols/test_openmm_afe_slow.py 25.39% 47 Missing ⚠️
openfe/analysis/plotting.py 12.82% 34 Missing ⚠️
openfe/protocols/openmm_rfe/equil_rfe_methods.py 48.64% 19 Missing ⚠️
...protocols/openmm_afe/equil_solvation_afe_method.py 60.00% 8 Missing ⚠️
openfecli/parameters/plan_network_options.py 93.75% 4 Missing ⚠️
openfecli/commands/gather.py 83.33% 3 Missing ⚠️
openfe/protocols/openmm_afe/base.py 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #641      +/-   ##
==========================================
- Coverage   92.21%   90.97%   -1.24%     
==========================================
  Files         124      127       +3     
  Lines        8594     8679      +85     
==========================================
- Hits         7925     7896      -29     
- Misses        669      783     +114     
Flag Coverage Δ
fast-tests 90.97% <67.32%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mikemhenry mikemhenry changed the title Fix docker image building Fix docker image building + CI improvements Nov 16, 2023
@mikemhenry
Copy link
Contributor Author

If I understand https://docs.codecov.com/docs/flags correctly, using flags should help with codcov comparing coverage from when we run slow tests (in the past) to PRs

@mikemhenry mikemhenry requested a review from IAlibay November 16, 2023 23:46
@mikemhenry mikemhenry marked this pull request as ready for review November 16, 2023 23:46
@mikemhenry
Copy link
Contributor Author

mikemhenry commented Nov 16, 2023

@IAlibay (and anyone else reviewing this)

This run tests the docker pipeline: https://github.com/OpenFreeEnergy/openfe/actions/runs/6897862437

So we want to make sure that passes before we merge this in.

Copy link
Member

@IAlibay IAlibay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

overall lgtm, couple of comments


- name: codecov-schedule
if: ${{ github.repository == 'OpenFreeEnergy/openfe'
&& github.event_name == 'schedule' }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

schedule is always a bit of a pain because codecov has that annoying thing where it fails if it gets the same commit too many times, would it make sense to limit this to merge instead?

Copy link
Contributor Author

@mikemhenry mikemhenry Nov 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, so its the merges! I couldn't figure out how (as the yaml existed) codcov got a bunch of the coverage for the slow tests since I noticed we didn't run the slow ones on a schedule, but we run the slow tests whenever it isn't a pull_request. Should I do not pr & not schedule to match the logic of when we run slow tests? Like if someone make a commit to main directly, I don't think that would be a merge event but the slow tests would still run.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@IAlibay Let me know if the updated logic is better now, I went with "not schedule && not pull request" so we can cover any case where a slow test is ran (not pull) but only upload if it isn't a schedule run.

.github/workflows/docker-cron.yaml Show resolved Hide resolved
@mikemhenry mikemhenry requested a review from IAlibay November 17, 2023 14:08

- name: codecov-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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's a syntax error on this line apparently

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can't weve comments into the expression it seems, fixed!

.github/workflows/ci.yaml Outdated Show resolved Hide resolved
Copy link
Member

@IAlibay IAlibay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@IAlibay IAlibay merged commit 87efe47 into main Nov 20, 2023
@IAlibay IAlibay deleted the fix/docker_image_building_issue_610 branch November 20, 2023 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

docker tests are failing
2 participants