dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Meta: Do not require branch/commit consistency in Flatpak

Browse source 
Our Flatpak builds currently start failing once a commit ID no longer
matches with the commit pointed to by the configured `branch`. This is
becoming pretty annoying for Skia, since the `chrome/mXYZ` branches are
effectively moving targets.

Change the `branch` key in the Flatpak config to `x-branch`, which
removes the constraint and allows Flatpak to work with just the pinned
commit IDs. Change the linter to still use `x-branch` as the reference
to compare with our vcpkg configuration, so we make sure to still keep
things consistent between vcpkg and Flatpak.
This commit is contained in:
Jelle Raaijmakers 2026-05-05 10:54:46 +02:00 committed by Jelle Raaijmakers
parent 3564dc1c81
commit 69f5876abb
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Meta/CMake/flatpak/org.ladybird.Ladybird.json
View file

@ -133,7 +133,7 @@
"type": "git",
"url": "https://chromium.googlesource.com/angle/angle",
"commit": "79ac1a8cd767a32cce6401203e20c4bd4ca4d539",
"branch": "chromium/7258_13",
"x-branch": "chromium/7258_13",
"dest": "angle",
"disable-submodules": true
},
@ -494,7 +494,7 @@
"type": "git",
"url": "https://skia.googlesource.com/skia.git",
"commit": "cd0c5f445516ea4e90e02b5f634cbc5ca23b5a44",
"branch": "chrome/m144"
"x-branch": "chrome/m144"
},
{
"type": "file",

4
Meta/Linters/check_flatpak.py
View file

@ -183,10 +183,10 @@ def check_vcpkg_vs_flatpak_versioning():
mismatch_found |= match_and_update(name, tag)
break
elif "branch" in source:
elif "branch" in source or "x-branch" in source:
# Get the branch
# Strip '_' postfix, replace '/' with '_': chromium/7258_13 vs chromium_7258
branch = str(source["branch"]).split("_")[0].replace("/", "_")
branch = str(source.get("branch", source.get("x-branch"))).split("_")[0].replace("/", "_")
mismatch_found |= match_and_update(name, branch)
break