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

Bump external/pipeline-Nextflow-config from da8e990 to 3ec7186 #22

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Feb 12, 2024

Bumps external/pipeline-Nextflow-config from da8e990 to 3ec7186.

Commits
  • 3ec7186 Merge pull request #60 from uclahs-cds/yashpatel-use-params-resource-allocations
  • 8a1c1b3 Update CHANGELOG
  • 81c96ec Update resource allocation function to check and use params setting if available
  • See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Feb 12, 2024
@sorelfitzgibbon
Copy link
Collaborator

@dependabot rebase

@dependabot dependabot bot force-pushed the dependabot/submodules/external/pipeline-Nextflow-config-3ec7186 branch from d1c56e3 to 9d91432 Compare March 8, 2024 15:52
@sorelfitzgibbon
Copy link
Collaborator

@dependabot rebase

Copy link
Contributor Author

dependabot bot commented on behalf of github Mar 8, 2024

Looks like this PR is already up-to-date with main! If you'd still like to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

@sorelfitzgibbon
Copy link
Collaborator

@dependabot recreate

Bumps [external/pipeline-Nextflow-config](https://github.com/uclahs-cds/pipeline-Nextflow-config) from `da8e990` to `3ec7186`.
- [Release notes](https://github.com/uclahs-cds/pipeline-Nextflow-config/releases)
- [Commits](uclahs-cds/pipeline-Nextflow-config@da8e990...3ec7186)

---
updated-dependencies:
- dependency-name: external/pipeline-Nextflow-config
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot force-pushed the dependabot/submodules/external/pipeline-Nextflow-config-3ec7186 branch from 9d91432 to a6eb4bc Compare March 8, 2024 15:58
@sorelfitzgibbon
Copy link
Collaborator

@aholmes @nwiltsie Low Priority. I added a plantuml figure (among many other revisions) to this repo while a dependabot PR was in place. After merging all other branches I went to rebase the dependabot branch, @dependabot rebase and it failed the plantuml action: fatal: Invalid revision range d1c56e3ab79e4534a825b8e19f3c5d1bf339edd9..9d914328d0782e17f7c41257e9cc2131734c174b
Error: Process completed with exit code 128.
. I tried rebase a second time which also failed, then @dependabot recreate which was successful.

Is this something that shouldn't happen and can be fixed. Or should I just add the situation to the instructions at Dependabot Pull Request Protocol

@nwiltsie
Copy link
Member

nwiltsie commented Mar 8, 2024

@sorelfitzgibbon In the best case, this came up because main acquired a PlantUML image between when this PR was opened and when you rebased it, which is a relatively uncommon case.

In the worst case this came up because a PlantUML image existed, period, and so will come up again any time we rebase a dependabot PR.

I'm not sure which of those this is yet, but I've opened uclahs-cds/tool-PlantUML-action#3 to track it. In the meantime @dependabot recreate will solve the problem (although it will lose any commits we've made manually, which we generally shouldn't be doing anyway).

Copy link
Collaborator

@sorelfitzgibbon sorelfitzgibbon left a comment

Choose a reason for hiding this comment

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

Passed NFtest /hot/software/pipeline/pipeline-SQC-DNA/Nextflow/development/unreleased/dependabot/submodules/external/pipeline-Nextflow-config-3ec7186/log-nftest-20240308T164844Z.log

@sorelfitzgibbon sorelfitzgibbon merged commit e52143a into main Mar 8, 2024
1 check passed
@dependabot dependabot bot deleted the dependabot/submodules/external/pipeline-Nextflow-config-3ec7186 branch March 8, 2024 17:21
@aholmes
Copy link
Member

aholmes commented Mar 8, 2024

More info on the PlantUML failure.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants