-
Notifications
You must be signed in to change notification settings - Fork 8
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
Update runtime and scratch desktop #55
Update runtime and scratch desktop #55
Conversation
Started test build 82833 |
Build 82833 failed |
There's one last (I think) thing to do here, which is scratch-gui added a prepublish script. A prepublish script is yet another diabolical way a nodejs project can ruin the day of anyone who cares about reproducible builds. This one runs this glob of code: https://github.com/scratchfoundation/scratch-gui/blob/develop/scripts/prepublish.mjs#L113-L126. I was hoping to just ignore it and not download this file and call it a day, //but// it breaks the build, so i need to add some extra handling to the project's Python script that generates "asset-sources.json". |
d1c5f3d
to
455d1f9
Compare
Started test build 82966 |
Build 82966 failed |
Started test build 82970 |
Build 82970 failed |
Update runtime to org.freedesktop.Platform//22.08 Update nodejs to 16 Update scratch-desktop to v3.30.5
5433d52
to
d635e9d
Compare
Started test build 83019 |
Build 83019 failed |
d635e9d
to
b744c92
Compare
Started test build 83021 |
Build 83021 failed |
The current scratch-desktop uses the file chooser portal.
b744c92
to
9187780
Compare
Started test build 83023 |
Build 83023 successful
|
9187780
to
de2d158
Compare
Started test build 83134 |
Build 83134 successful
|
Thanks!
Might be worth mentioning in the readme if that needs to be redone when flatpak-node-generator gets run?
I don't see any changes there other than the URL update, was this no longer necessary or did they get accidentally left out of the commits? |
Yeah, I can do that :) Maybe I'll add a note to run
Yep, I ended up squashing that change into c5126b6. Mostly this part: c5126b6#diff-1660a6484fcf48528c7f07a34e072c0405e15616909a7ddf1c8df4dfd9189273R99-R107, and the addition of |
Our system for generating package sources is complicated. So, it is useful to check that the resulting files are correct, and it quicker to run flatpak-builder-lint locally before submitting to Flathub.
Started test build 83168 |
Build 83168 successful
|
bot, build |
Queued test build for edu.mit.Scratch. |
Started test build 83853 |
Build 83853 successful
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm just a person but this looks good to me.
- 'install -Dm 644 edu.mit.Scratch.desktop /app/share/applications/edu.mit.Scratch.desktop' | ||
- install -Dm 644 edu.mit.Scratch.appdata.xml /app/share/metainfo/edu.mit.Scratch.appdata.xml | ||
- install -Dm 644 edu.mit.Scratch.desktop /app/share/applications/edu.mit.Scratch.desktop | ||
- install -Dm 644 edu.mit.Scratch.mime.xml /app/share/mime/packages/edu.mit.Scratch.mime.xml |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interesting, today I learned how mime types are exported by Flatpak apps.
sha256: dfd574b709307fe76c44dbb6b0ac8942e7908f4d5c18359fae25fbda3c9f4399 | ||
- type: inline | ||
dest: scratch-gui-src-generated | ||
dest-filename: microbit-hex-url.cjs |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm sorry to report that this extension doesn't work, but that's not a regression.
In addition to updating scratch-desktop and its ilk, along with the runtime (which all happened together due to requiring a newer version of NodeJS), I ended up doing a few other things while I was here:
edu.mit.Scratch.yaml
, removing some old comments and unused code.filesystem=home
permission.*.sb3
files from Scratch, so I added the same kind of support to the Scratch app. The mime type is a bit odd (application/x.scratch.sb3
as opposed toapplication/x-scratch-sb3
), but that appears to be the format Scratch upstream uses, as well as Turbowarp.I ran into one strange issue where the URL for the scratch-gui git repo in
generated-sources.json
turned out to be agit+ssh://
style URL, which Flathub wasn't impressed with. I'd love to explore why that happened, but for now, I manually changed it to anhttps://
URL.Also, note that I'm only updating to
org.freedesktop.Platform//22.08
for now. I'd like to bump all the way to 23.08 soon, but this was already tricky to line up (due to also needing a different version of NodeJS), so I think it's easier doing that separately.I'm happy to split this all into different pull requests if you prefer.