Skip to content

Conversation

@a-wai
Copy link
Collaborator

@a-wai a-wai commented Feb 14, 2025

This is quite straightforward, only requiring to explicitly mark the proxies as pub.

Note: Debian just switched to this version as of yesterday.

@samcday
Copy link
Owner

samcday commented Feb 14, 2025

Awesome, thanks for sending this :)

Note: Debian just switched to this version as of yesterday.

Ah-ha! I just bumped squeekboard to v4 a few days ago, so when I saw the subject line in my email without yet registering you as the author, my brain immediately screamed "but the Debians!" 😅

What does the timeline on zbus v5 in Debian look like? I guess it would appropriate for me to update the squeekboard MR too?

@a-wai
Copy link
Collaborator Author

a-wai commented Feb 14, 2025

my brain immediately screamed "but the Debians!" 😅

Hehe, that's kind of you, but don't worry, we're kinda used to patching deps ;) (as long as breakages aren't too hard to fix, that is)

What does the timeline on zbus v5 in Debian look like?

It has been uploaded to unstable yesterday, so it is already the only available version for new package uploads.

I guess it would appropriate for me to update the squeekboard MR too?

Probably, hoping it will be quite easy as well.

@samcday
Copy link
Owner

samcday commented Feb 14, 2025

Just rebased your branch to see if CI works properly from forks now

@samcday
Copy link
Owner

samcday commented Feb 14, 2025

Hehe, that's kind of you, but don't worry, we're kinda used to patching deps ;) (as long as breakages aren't too hard to fix, that is)

Hehe, well I'd still prefer to reduce the amount of work created for distro packaging duties, not arbitrarily add to it :D When I was lurking the Fedora Rust Matrix channel for a while, I observed more than a few "upstream bumped <dep> to <foo> without any commentary/context as to why 🙀"

Anyways coolio, I'll take another look at the squeekboard MR soon 👍

@github-actions

This comment has been minimized.

@samcday
Copy link
Owner

samcday commented Feb 14, 2025

/packit build

@samcday
Copy link
Owner

samcday commented Feb 14, 2025

Uh, hmm, interesting. Seems that the build failed in Fedora: https://download.copr.fedorainfracloud.org/results/packit/samcday-phrog-106/fedora-41-aarch64/08654498-phrog/builder-live.log.gz

error[E0581]: return type references an anonymous lifetime, which is not constrained by the fn input types
  --> tests/emergency_calls.rs:33:5
   |
33 |     async fn emergency_numbers_changed(signal_ctxt: &zbus::SignalContext<'_>) -> zbus::Result<()>;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: lifetimes appearing in an associated or opaque type are not considered constrained
   = note: consider introducing a named lifetime parameter

Fedora is still on zbus 5.2, even in rawhide, maybe that's why? (It shouldn't be why, of course 😅)

@samcday
Copy link
Owner

samcday commented Feb 14, 2025

Alright well, I see now.. The #YOLO CI changes I pushed a few mins ago indeed got the build running again ... Except pull_request_target builds the base branch rather than the PR head ref. I misread the dox - thought it only used the base upstream ref for the workflow file. Sigh.

I'm guessing what actually happened here is you based your changes on 0.44.1, but I merged some new zbus usage in the emergency calls tests (#99) a couple of days ago.

@samcday
Copy link
Owner

samcday commented Feb 14, 2025

Sorry, just rudely rebased your branch again 🙃

@samcday samcday added ci-ok PR looks safe / author is trusted, run pull_request_target build workflow and removed ci-ok PR looks safe / author is trusted, run pull_request_target build workflow labels Feb 14, 2025
@samcday
Copy link
Owner

samcday commented Feb 14, 2025

Okay, finally coaxed the CI into a usable state, and now the build is (correctly) failing when compiling the emergency-calls test. I'm done booping your branch so feel free to update at your leisure :) I would volunteer to do it, but this time I'd like to make sure the CI behaves the right way when you push up a change 🙏

@a-wai
Copy link
Collaborator Author

a-wai commented Feb 14, 2025

I'm guessing what actually happened here is you based your changes on 0.44.1

Oops yeah, I meant to build from main then got distracted, sorry about that... I'll follow-up ASAP, either later today or tomorrow.

@a-wai
Copy link
Collaborator Author

a-wai commented Feb 14, 2025

Dammit, my brain executed cargo check (too used to meson I guess) instead of cargo test, fixing the error rn

This is quite straightforward, only requiring to explicitly mark the
proxies as `pub` as well as a function signature change in the
`emergency_calls` test.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
@github-actions
Copy link

The CI build recorded and generated some videos

Demo video (shown on README and release notes)

accent-colours

emergency-calls

first-run

keypad-shuffle

simple-flow

trivial-flow

@samcday
Copy link
Owner

samcday commented Feb 14, 2025

/packit build

@samcday
Copy link
Owner

samcday commented Feb 14, 2025

Looking good. Thanks a bunch!

@samcday samcday merged commit f12c92e into samcday:main Feb 14, 2025
6 of 7 checks passed
@a-wai a-wai deleted the port-zbus-5 branch February 14, 2025 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-ok PR looks safe / author is trusted, run pull_request_target build workflow

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants