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

test: Depend on a recent enough version of libportal #1527

Merged
merged 1 commit into from
Dec 21, 2024

Conversation

hfiguiere
Copy link
Collaborator

Without this the build fail if you have libportal 0.8.1 installed

This is needed for the notification work.

@swick
Copy link
Contributor

swick commented Dec 6, 2024

Would be nice to have the "why?" answered in the commit message and not just in a github comment.

smcv
smcv previously requested changes Dec 6, 2024
Copy link
Collaborator

@smcv smcv left a comment

Choose a reason for hiding this comment

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

As @swick said,

Would be nice to have the "why?" answered in the commit message and not just in a github comment.

@@ -120,7 +120,7 @@ geoclue_dep = dependency(
)
libportal_dep = dependency(
'libportal',
version: '>= 0.8.1',
version: '>= 0.9.0',
Copy link
Collaborator

Choose a reason for hiding this comment

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

libportal 0.9.0 has not been released yet. If x-d-p needs a newer libportal than 0.8.1, then we need a libportal release first.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

the thing is:

  1. it's only for the test
  2. it used to be that it wanted a special branch off the repository and I pushed back. This is currently in master in the official repo.
  3. this is meant to trigger the meson subproject. I have 0.8.1 installed and the build fail because of that (it build the tests in the default target).

So we can keep the build broken until a release, or we can just accept it and move forward. Or disable the tests again.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, the projects have a cyclic dependency so depending on an unreleased version is fine, until we want to have a release.

@hfiguiere
Copy link
Collaborator Author

Would be nice to have the "why?" answered in the commit message and not just in a github comment.

done.

@GeorgesStavracas
Copy link
Member

libportal uses the post-release version bump scheme, so technically the main branch is already 0.9.0 (but still untagged) and projects can start requiring this version for features that will only exist in the 0.9.0 release.

@hfiguiere
Copy link
Collaborator Author

I started building in a fresh toolbox that has not libportal-devel. The subproject fetches 0.8.1 and thus the build fail.

@hfiguiere
Copy link
Collaborator Author

So I'm not sure in which circumstances this is supposed to work OOB, but with this PR it does in that case as well.

@swick
Copy link
Contributor

swick commented Dec 19, 2024

ping @smcv

Copy link
Collaborator

@smcv smcv left a comment

Choose a reason for hiding this comment

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

If x-d-p needs an unreleased libportal, I would still prefer that to be resolved by releasing libportal, returning x-d-p git main to a state where it is releasable. But I'm not a particularly active maintainer in this project, so if other maintainers have different ideas I'm not going to veto them.

@smcv smcv self-requested a review December 19, 2024 14:55
Copy link
Collaborator

@smcv smcv left a comment

Choose a reason for hiding this comment

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

hopefully leaving this comment will clear my previous "changes requested"?

@smcv smcv dismissed their stale review December 19, 2024 14:58

My opinion is not a blocker if other maintainers disagree with it

The notification API for the notification test is only in
current git (0.9.0). Without this the test fail to build if you have
the current release installed: this triggers the meson
subproject build.

Signed-off-by: Hubert Figuière <[email protected]>
@hfiguiere
Copy link
Collaborator Author

@GeorgesStavracas
Copy link
Member

libportal 0.9.0 has been released so this is unblocked now

@GeorgesStavracas GeorgesStavracas added this pull request to the merge queue Dec 21, 2024
@GeorgesStavracas GeorgesStavracas removed this pull request from the merge queue due to a manual request Dec 21, 2024
@GeorgesStavracas GeorgesStavracas added this pull request to the merge queue Dec 21, 2024
Merged via the queue into flatpak:main with commit 53824de Dec 21, 2024
5 checks passed
@hfiguiere hfiguiere deleted the test-build-fix branch December 21, 2024 04:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Triaged
Development

Successfully merging this pull request may close these issues.

4 participants