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.

Sign up for GitHub

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

Jump to bottom

build(deps): bump the cargo-minor group across 1 directory with 2 updates (rfd and ashpd) #18645

Merged
merged 1 commit into from
Dec 13, 2024
Merged

build(deps): bump the cargo-minor group across 1 directory with 2 updates (rfd and ashpd) #18645

merged 1 commit into from
Dec 13, 2024
+33 −144

Conversation

torokati44
Copy link
Member

@torokati44 torokati44 commented Nov 18, 2024 •
edited
Loading

Manually extracted from #18617 (which got superseded by #18644, and later #18647), because these needed a little extra attention.

Let's do a @dependabot unignore rfd and @dependabot unignore ashpd after this. Referencing dependabot/dependabot-core#10286 again.

Bumps the cargo-minor group with 2 updates in the / directory:

Package From To
rfd 0.15.0 0.15.1
ashpd 0.9.2 0.10.2

Updates rfd from 0.15.0 to 0.15.1

Updates ashpd from 0.9.2 to 0.10.2

@torokati44 torokati44 added A-deps Area: Dependencies T-chore Type: Chore (like updating a dependency, it's gotta be done) labels Nov 18, 2024
@torokati44
Copy link
Member Author

Also see: #18617 (review)

@torokati44
Copy link
Member Author

Re: @adrian17 (#18617 (comment)):

We have used async-std until now. However, see PolyMeilex/rfd#161.
By switching it to tokio instead, which we depend on anyway, we can drop the entire async-* suite!

@torokati44
Copy link
Member Author

I tried to check whether everything still works in Flatpak (and with GameMode), but I had no luck building the former 1, and don't use the latter ... so, hlep, @kjarosh? O.O

Footnotes

  1. error: failed to select a version for the requirement `clap = "^4.5.20"` (locked to 4.5.20)
candidate versions found which didn't match: 4.5.21
location searched: directory source `/run/build/ruffle/cargo/vendor` (which is replacing registry `crates-io`)
    ↩

@kjarosh
Copy link
Member

kjarosh commented Nov 20, 2024

I'm coming!

Did you remember to regenerate cargo sources? It has to be done every time the dependencies change.

I've just finished testing this PR, and GameMode, file pickers, theme integration all work properly both in Flatpak and outside of it 🎉

@torokati44
Copy link
Member Author

Did you remember to regenerate cargo sources? It has to be done every time the dependencies change.

Yes, but maybe not hard enough...?!

@kjarosh
Copy link
Member

kjarosh commented Nov 20, 2024

Hmm... That's interesting.

All I did was:

  1. Run make regenerate-sources RUFFLE_COMMIT=11710684d4f61554d5ae4ab30487a7dfaee8476b
  2. Replace commit in the descriptor with 11710684d4f61554d5ae4ab30487a7dfaee8476b, comment out tag
  3. Run make

@torokati44
Copy link
Member Author

Yeah, well, step 2 is not in the README of the FlatHub repo... 😶

@torokati44
Copy link
Member Author

Not skipping that, it built fine for me too! 🥳

Does this mean it's merge o'clock, @adrian17?

@kjarosh
Copy link
Member

kjarosh commented Nov 20, 2024

This should be useful:

@torokati44 torokati44 mentioned this pull request Nov 20, 2024
Closed
@torokati44 torokati44 requested a review from adrian17 November 23, 2024 12:49
@torokati44 torokati44 force-pushed the bump-ashpd-rfd branch 2 times, most recently from 666852f to 8c146ab Compare November 29, 2024 14:28
@torokati44 torokati44 added the waiting-on-review Waiting on review from a Ruffle team member label Dec 9, 2024
@dependabot @torokati44
build(deps): bump the cargo-minor group across 1 directory with 2 upd…
bd78b32 
…ates

Bumps the cargo-minor group with 2 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [rfd](https://github.com/PolyMeilex/rfd) | `0.15.0` | `0.15.1` |
| [ashpd](https://github.com/bilelmoussaoui/ashpd) | `0.9.2` | `0.10.2` |

Updates `rfd` from 0.15.0 to 0.15.1
- [Release notes](https://github.com/PolyMeilex/rfd/releases)
- [Changelog](https://github.com/PolyMeilex/rfd/blob/master/CHANGELOG.md)
- [Commits](PolyMeilex/rfd@0.15.0...0.15.1)

Updates `ashpd` from 0.9.2 to 0.10.2
- [Release notes](https://github.com/bilelmoussaoui/ashpd/releases)
- [Commits](bilelmoussaoui/ashpd@0.9.2...0.10.2)
@torokati44 torokati44 enabled auto-merge (rebase) December 13, 2024 22:34
@torokati44 torokati44 merged commit 24ebd8f into ruffle-rs:master Dec 13, 2024
22 checks passed
@Lord-McSweeney Lord-McSweeney removed the waiting-on-review Waiting on review from a Ruffle team member label Dec 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adrian17 adrian17 adrian17 approved these changes

Assignees
No one assigned
Labels
A-deps Area: Dependencies T-chore Type: Chore (like updating a dependency, it's gotta be done)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@torokati44 @kjarosh @adrian17 @Lord-McSweeney