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 merge conflicts from nf-core template v1.12 update #7

Merged
merged 4 commits into from
Nov 24, 2020

Conversation

heuermh
Copy link
Contributor

@heuermh heuermh commented Nov 22, 2020

An attempt to fix merge conficts in #6 ; seems there is an issue with the Docker image version of smoothxg being out-of-sync with both the command used here and also with that in https://github.com/pangenome/pggb/blob/master/pggb.

See pangenome/pggb#30

@heuermh
Copy link
Contributor Author

heuermh commented Nov 22, 2020

Also, it is hard to tell if CI is actually running the workflow

...
N E X T F L O W  ~  version 20.10.0
Launching `/home/runner/work/pangenome/pangenome/main.nf` [stoic_monod] - revision: a886153fcf
WARN: DSL 2 IS AN EXPERIMENTAL FEATURE UNDER DEVELOPMENT -- SYNTAX MAY CHANGE IN FUTURE RELEASE
----------------------------------------------------
                                        ,--./,-.
        ___     __   __   __   ___     /,-._.--~'
  |\ | |__  __ /  ` /  \ |__) |__         }  {
  | \| |       \__, \__/ |  \ |___     \`-._,-`-,
                                        `._,._,'
  nf-core/pangenome v1.0dev
----------------------------------------------------

[ec/17b293] Submitted process > edyeet (1)
[b9/9df2ed] Submitted process > seqwish (1)
[e3/3c3529] Submitted process > smoothxg (1)
[f0/9a514d] Submitted process > odgiBuild (1)
[ba/083e49] Submitted process > odgiChop (1)
[46/24b8c6] Submitted process > odgiViz (1)
[e1/08f70e] Submitted process > odgiLayout (1)
[97/5b2e3b] Submitted process > odgiDraw (1)
WARN: To render the execution DAG in the required format it is required to install Graphviz -- See http://www.graphviz.org for more info.

https://github.com/nf-core/pangenome/pull/7/checks?check_run_id=1439564849

From running this locally, I expect it to fail.

@heuermh
Copy link
Contributor Author

heuermh commented Nov 24, 2020

Ready for review.

This is working for me now locally with a new pull of the ghcr.io/pangenome/pggb:latest tag. The failing check in nf-core lint can safely be ignored, see nf-core/tools#791 and discussion on Slack.

Copy link
Member

@Zethson Zethson left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@Zethson Zethson merged commit bedf66a into nf-core:dev Nov 24, 2020
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.

4 participants