Skip to content

Conversation

@bbimber
Copy link
Contributor

@bbimber bbimber commented Jul 29, 2025

No description provided.

@bbimber
Copy link
Contributor Author

bbimber commented Jul 29, 2025

Hi @labkey-jeckels: this should be a pretty perfunctory update, but I cant create PR branches on server/platform anymore. This PR is currently targeting release25.3-SNAPSHOT; however, I think I need someone with write permissions to:

  • Make a 25.3_fb_htsjdk on the labkey side of this fork
  • Merge this single-line change into that branch (or maybe just edit the one line in github directly).
  • Open a PR to merge that branch into release25.3-SNAPSHOT and let TeamCity run.

There is a related change here: BimberLab/DiscvrLabKeyModules#343

Would it be possible for someone at LabKey to help make that update? Thanks in advance for any help.

@labkey-jeckels labkey-jeckels self-requested a review July 29, 2025 23:11
@labkey-jeckels labkey-jeckels self-assigned this Jul 29, 2025
@labkey-jeckels
Copy link
Contributor

I've created the mirror of the FB. TeamCity is running now.

@bbimber
Copy link
Contributor Author

bbimber commented Jul 30, 2025

Thanks

@bbimber
Copy link
Contributor Author

bbimber commented Jul 30, 2025

@labkey-jeckels: note, my second commit here (BimberLab/DiscvrLabKeyModules#343) should address that FastqRunner failure. I'm not sure if my commit on that PR will re-trigger team city though.

@bbimber
Copy link
Contributor Author

bbimber commented Jul 30, 2025

I believe that JBrowse failure is a timing problem (i've never seen that particular issue before: https://teamcity.labkey.org/buildConfiguration/LabKey_253Release_External_Discvr_ExternalModulesTestPostgres/3602051), not related to this change.

Otherwise it seems to have passed.

@labkey-jeckels
Copy link
Contributor

The JBrowse test passed on a rerun. The FastqRunner test failed on rerun, presumably because it's running against the LK fork of DiscvrLabKeyModules. Is the plan to merge your DiscvrLabKeyModules changes into the LK repo immediately afterwards?

@bbimber
Copy link
Contributor Author

bbimber commented Jul 30, 2025

Team city doesn't pull from the same side of the fork?

Yes, I can do a merge to the LK side at the same time. This would be LabKey/DiscvrLabkeyModules on the release25.3-SNAPSHOT branch, right?

@bbimber
Copy link
Contributor Author

bbimber commented Jul 31, 2025

@labkey-jeckels, this PR cherry picks the FastqcRunner / picard version changes on release25.3-SNAPSHOT: LabKey/DiscvrLabKeyModules#376

@labkey-jeckels
Copy link
Contributor

Team city doesn't pull from the same side of the fork?

Yes, I can do a merge to the LK side at the same time. This would be LabKey/DiscvrLabkeyModules on the release25.3-SNAPSHOT branch, right?

This (and almost all other TeamCity builds) pull from the LabKey fork of the repo. The External/DISCVR projects pull from you copy of the repo.

Correct on the merge target.

@bbimber
Copy link
Contributor Author

bbimber commented Jul 31, 2025

@labkey-jeckels: OK. What would you like prior to approving this PR? Do you want to restart the failed DRTs (it didnt look like I could re-trigger them myself). I believe that release25.3-SNAPSHOT targeting PR/branch will should be picked up by TeamCity now, right?

@labkey-jeckels
Copy link
Contributor

@labkey-jeckels: OK. What would you like prior to approving this PR? Do you want to restart the failed DRTs (it didnt look like I could re-trigger them myself). I believe that release25.3-SNAPSHOT targeting PR/branch will should be picked up by TeamCity now, right?

I retriggered them manually and see your commits in the list of changes. Assuming it passes as expected I will go ahead and merge this PR.

@bbimber
Copy link
Contributor Author

bbimber commented Jul 31, 2025

excellent, thank you

@labkey-jeckels labkey-jeckels merged commit 72c0218 into LabKey:release25.3-SNAPSHOT Jul 31, 2025
4 of 6 checks passed
@bbimber bbimber deleted the 25.3_fb_htsjdk branch July 31, 2025 21:20
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.

2 participants