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 gradle 8 publishing issue #1904

Merged
merged 1 commit into from Jul 28, 2023
Merged

Fix gradle 8 publishing issue #1904

merged 1 commit into from Jul 28, 2023

Conversation

kshakir
Copy link
Contributor

@kshakir kshakir commented Jul 28, 2023

Description

Fixes gradle publish after changes in #1903

Checklist (never delete this)

Never delete this, it is our record that procedure was followed. If you find that for whatever reason one of the checklist points doesn't apply to your PR, you can leave it unchecked but please add an explanation below.

Content

  • Added or modified tests to cover changes and any new functionality
  • Edited the README / documentation (if applicable)
  • All tests passing on github actions

Review

  • Final thumbs-up from reviewer
  • Rebase, squash and reword as applicable

For more detailed guidelines, see https://github.com/broadinstitute/picard/wiki/Guidelines-for-pull-requests

@kshakir kshakir marked this pull request as ready for review July 28, 2023 13:32
@kshakir
Copy link
Contributor Author

kshakir commented Jul 28, 2023

Notes:

  1. Snapshot publishing seems to have been disabled when switching to GH Actions: https://github.com/broadinstitute/picard/pull/1853/files#diff-6ac3f79fc25d95cd1e3d51da53a4b21b939437392578a35ae8cd6d5366ca5485L41-L45
  2. Publishing has been manually tested this time: https://broadinstitute.jfrog.io/ui/native/libs-snapshot-local/com/github/broadinstitute/picard/3.0.0-18-g8d92c4404-SNAPSHOT/
  3. I used the above SNAPSHOT to test the draft GATK PR ✅: https://github.com/broadinstitute/gatk/actions/runs/5688165553?pr=8439
  4. Whenever we figure out things here with this PR, could someone either:
    a. release a picard 3.0.1 that I'll use over in the open GATK PR
    b. let me know if the PR should keep the picard SNAPSHOT, and sometime later both picard and the GATK will be updated and released at the same time

Copy link
Contributor Author

@kshakir kshakir left a comment

Choose a reason for hiding this comment

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

Does anyone have a preference for how to list dependencies?

I noticed in the GATK that it seems to be more like "Option a)" below.

Comment on lines -102 to -117
distZip {
dependsOn 'currentJar'
}

distTar {
dependsOn 'currentJar'
}

startScripts {
dependsOn 'currentJar'
}

startShadowScripts {
dependsOn 'currentJar'
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Option a) Multiple independent dependencies

Comment on lines +404 to +411
// For Gradle 8 explicitly add 'currentJar' as a dependency of the following tasks.
// For more information, please refer to
// https://docs.gradle.org/8.2.1/userguide/validation_problems.html#implicit_dependency in the Gradle documentation.
['distZip', 'distTar', 'startScripts', 'startShadowScripts', 'generateMetadataFileForPicardPublication'].each {
tasks.named(it).configure {
dependsOn 'currentJar'
}
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Option b) Use a loop to put them all in one place

Copy link
Member

Choose a reason for hiding this comment

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

It feels like there is probably a more idiomatic way to do this by adding it to the java component or something like that, but I don't know how and it doesn't seem worthwhile to figure it. This is way better than a zillion individual closures adding it.

@lbergelson lbergelson merged commit f11cbd0 into master Jul 28, 2023
6 checks passed
@lbergelson lbergelson deleted the ks_publish_patches branch July 28, 2023 15:40
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.

None yet

2 participants