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

TST: Remove custom CI skip #5734

Merged
merged 1 commit into from
Feb 10, 2021
Merged

TST: Remove custom CI skip #5734

merged 1 commit into from
Feb 10, 2021

Conversation

pllim
Copy link
Contributor

@pllim pllim commented Feb 9, 2021

@codecov
Copy link

codecov bot commented Feb 9, 2021

Codecov Report

Merging #5734 (6e59fbe) into master (bf24eae) will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #5734   +/-   ##
=======================================
  Coverage   74.27%   74.27%           
=======================================
  Files         408      408           
  Lines       37129    37134    +5     
  Branches     4571     4571           
=======================================
+ Hits        27577    27583    +6     
+ Misses       9552     9551    -1     
Flag Coverage Δ *Carryforward flag
nightly 75.67% <ø> (ø) Carriedforward from bf24eae
unit 53.16% <ø> (+0.33%) ⬆️

*This pull request uses carry forward flags. Click here to find out more.

Impacted Files Coverage Δ
jwst/associations/main.py 95.90% <0.00%> (+0.01%) ⬆️
jwst/associations/lib/dms_base.py 92.69% <0.00%> (+0.06%) ⬆️
jwst/tso_photometry/tso_photometry_step.py 77.41% <0.00%> (+1.61%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bf24eae...6e59fbe. Read the comment docs.

@jdavies-st
Copy link
Collaborator

Whoa! They listened to the users!

Now if they would just implement allowed_failure. 😅

@pllim
Copy link
Contributor Author

pllim commented Feb 10, 2021

Bad news is that currently the built-in CI skipping skips everything in .github/workflow but that isn't a problem for your current use case.

@jdavies-st
Copy link
Collaborator

Ah, so if you have a commit at HEAD that has [ci skip], then it will skip the merged job on master plus any cron jobs?

@jdavies-st
Copy link
Collaborator

Btw, is there a reason to keep the cancel_ci job in this workflow? Or can all of that be removed now?

@pllim
Copy link
Contributor Author

pllim commented Feb 10, 2021

Actually, I just merged the equivalent PR on astropy and it looks like the merge commit only has PR title, not the individual commit messages, so the merge ran the CI. I suspect cron would behave the same (I'll find out tomorrow). But if you have [ci skip] in the PR title, you deserve it (LoL).

Well, I have a fix in for cancelling at styfle/cancel-workflow-action#55 but it is just sitting there. You can choose to remove this altogether, keep it as is until my PR is merged (if ever), or use my forked branch; but I think that is out of scope here.

@jdavies-st
Copy link
Collaborator

I see. Cool. We'll just leave it here then.

I suspect you would run into the problem if you did "Rebase and merge" which would put that rebased commit with [ci skip] in the title at the HEAD of master. So I see where this could be a problem. We had the same problem back when we had our own Jenkins per-PR CI. Nothing changes.

Copy link
Collaborator

@jdavies-st jdavies-st left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks!

@jdavies-st jdavies-st merged commit c721119 into spacetelescope:master Feb 10, 2021
@pllim
Copy link
Contributor Author

pllim commented Feb 10, 2021

Yeah... at this point, the rule is server side now and out of our control. The only thing we can do is workaround it.

@pllim pllim deleted the patch-1 branch February 10, 2021 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants