jetbrains: idea-oss, pycharm-oss: 2025.1.1.1 -> 2025.3.1#470774
jetbrains: idea-oss, pycharm-oss: 2025.1.1.1 -> 2025.3.1#470774MattSturgeon merged 10 commits intoNixOS:masterfrom
Conversation
2a6c781 to
a7aaf7b
Compare
a7aaf7b to
dbc7227
Compare
MattSturgeon
left a comment
There was a problem hiding this comment.
Lot's of code here I'm not too familiar with, but looking at the diff things seem ok.
dbc7227 to
c3aa3d9
Compare
This comment was marked as duplicate.
This comment was marked as duplicate.
|
It seems that some more links on the cache redirector are now dead? Maybe they are entirely switching away from it now. Will check. |
|
Do those FODs use fallback Either way, if the primary URLs are 404ing then they probably need fixing, I assume. |
|
@MattSturgeon Can you try again? Might have been a temporary issue on Jetbrain's end. The URLs in your build logs (e. g. https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/utils/utils-ktor-jvm/0.8.74/utils-ktor-jvm-0.8.74.jar) are working and I can build everything just fine. I think that service is just a mirror for maven repos and some other pages, we could probably just add the non-mirrored URLs as well, but that'd require some more changes here. Currently fallback URLs are not used. I'll write that down as another future improvement to do. For example for the above URL https://packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/utils/utils-ktor-jvm/0.8.74/utils-ktor-jvm-0.8.74.jar works just fine as well. There were some URLs I noticed changed location and I replaced them with the new one used. But those would actually probably also work via the cache redirector... I don't know much about it's purpose - or anything really. |
This comment was marked as duplicate.
This comment was marked as duplicate.
|
That's really odd. I have no idea why it doesn't build inside Github Actions. |
|
I added fallback URLs that don't use the cache redirector service, hopefully it works now? |
600f692 to
7cfb37f
Compare
This comment was marked as duplicate.
This comment was marked as duplicate.
|
Turns out the download failures were a red herring (I still added the flag The actual error is this: The ant build step is here: https://github.com/JetBrains/intellij-community/blob/master/platform/jps-bootstrap/jps-bootstrap-classpath.xml#L18 I'm unfortunately not sure what this could mean. Maybe some incompatiblity in the GitHub Hosted Runners? |
MattSturgeon
left a comment
There was a problem hiding this comment.
A couple non-blocking bash hygine nits, in case you weren't aware of the subtleties here. Up to you whether to action them.
Overall PR still SGTM.
575a145 to
a13fc3d
Compare
|
Note for myself: I did not add plugin updates here, I expect #470147 to be merged first, if we backport this we should also run the plugin update script for the backport. I'm removing the label to do a manual backport later. |
a13fc3d to
3624c53
Compare
|
I was able to squash the review feedback into previous commits. And:
|
|
Please credit the suggestions provided by the reviewers via |
While Git commit metadata isn't the authoritative source of copyright in nixpkgs; licensing is covered by
Regardless, I'm fine for my suggestions to be merged into Nixpkgs without attribution. TL;DR: Adding |
SGTM. I've When backporting, you'll probably end up cherry picking this and doing a separate "update plugins" commit with a
Or
|
|
I thought it was, because a long time ago @emilazy said I needed to do it so I am confused now so it's not required????? |
Co-Authored-By: Matt Sturgeon <[email protected]>
Co-Authored-By: Matt Sturgeon <[email protected]>
Co-Authored-By: Matt Sturgeon <[email protected]>
3624c53 to
9724448
Compare
Updates
idea-ossandpycharm-ossto the latest version. Fixes various build issues & also automates generating the jps & restarter hashes.The source build is now also always updated from the latest release info, instead of just using whatever the bin versions use. This means the build processes are now independent.
There's quite a bit of code duplication between the bin/source update scripts. I plan to refactor this eventually. After this PR I'll introduce support for
updateScriptif & when #470147 is also merged.IMO we should exceptionally backport this to 25.11 since we haven't touched the source versions in a long time & to get the fixes onto the stable branch. Also since we are going to backport #466331 as well.
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.