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

chore: Move rfd dependency to workspace #17610

Merged
merged 1 commit into from
Aug 22, 2024

Conversation

kjarosh
Copy link
Member

@kjarosh kjarosh commented Aug 22, 2024

This makes sure there's only one version of rfd used and fixes Flatpak compilation issues.

error: checksum for `rfd v0.14.1` could not be calculated, but a checksum is listed in the existing lock file

this could be indicative of a few possible situations:

    * the source `registry `crates-io`` supports checksums,
      but was replaced with one that doesn't
    * the lock file is corrupt

unable to verify that `rfd v0.14.1` is the same as when the lockfile was generated

This makes sure there's only one version of rfd
used and fixes Flatpak compilation issues.
@kjarosh kjarosh requested a review from torokati44 August 22, 2024 09:47
Copy link
Member

@torokati44 torokati44 left a comment

Choose a reason for hiding this comment

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

If you want this to really stick, you could also add rfd to deny.toml, next to tracy-client and image.

@kjarosh
Copy link
Member Author

kjarosh commented Aug 22, 2024

I don't think it's an issue specific to rfd. I suspect any dependency defined two times (git + crates.io) with the same version will produce this error :/ Probably a bug in flatpak-builder-tools or in cargo.

@torokati44 torokati44 enabled auto-merge (rebase) August 22, 2024 10:00
@torokati44
Copy link
Member

torokati44 commented Aug 22, 2024

Would it make sense to add a Flatpak build check as a weekly CI run (like for the AMO Docker image), or not, because updates are done manually by us anyway, and any issues can be fixed immediately?

@kjarosh
Copy link
Member Author

kjarosh commented Aug 22, 2024

Would it make sense to add a Flatpak build check as a weekly CI run

I'll think about and maybe create a workflow, but in general I do not expect huge discrepancies in the build process, as Flatpak build is just cargo build, but offline.

@torokati44
Copy link
Member

Flatpak build is just cargo build, but offline.

The "internal" Rust build may be, but isn't there some additional bells and whistles to turn the binary into an actual Flatpak? I meant more to check those parts, not necessarily what cargo does. But I'm not that familiar with how this sausage is made...

@kjarosh
Copy link
Member Author

kjarosh commented Aug 22, 2024

The "internal" Rust build may be, but isn't there some additional bells and whistles to turn the binary into an actual Flatpak? I meant more to check those parts, not necessarily what cargo does. But I'm not that familiar with how this sausage is made...

That is true, but unintuitively these bells and whistles are problematic to be tested here, as in case they need to be updated, the build will fail even if everything's okay.

Imagine that we move a .desktop file in upstream (so here), the path will also need to be changed downstream (Flathub), but if we just take the downstream as-is and replace sources, the build will fail because the path is not yet updated. Moreover, it cannot be updated unless we also update the version of upstream, so there's the chicken and egg problem.

@torokati44 torokati44 merged commit 9f8b891 into ruffle-rs:master Aug 22, 2024
17 checks passed
@kjarosh kjarosh deleted the rfd-workspace branch August 22, 2024 10:22
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