Merge pull request 'fix(flatpak): the WSI layer module builds again — vkroots was declared twice' (#65) from worktree-flatpak-vkroots into main
ci / rust-arm64 (push) Successful in 1m22s
ci / web (push) Successful in 1m21s
ci / docs-site (push) Successful in 1m44s
flatpak / build-publish (push) Successful in 6m22s
ci / rust (push) Successful in 7m50s
docker / builders (ci/android-ci.Dockerfile, punktfunk-android-ci) (push) Successful in 12s
docker / builders (ci/arch-ci.Dockerfile, punktfunk-arch-ci) (push) Successful in 14s
docker / builders (ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Failing after 51s
docker / builders (ci/rust-ci-noble.Dockerfile, punktfunk-rust-ci-noble) (push) Successful in 8s
docker / builders (ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 12s
docker / apps (., web/Dockerfile, punktfunk-web) (push) Successful in 10s
docker / apps (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 14s
docker / deploy-docs (push) Failing after 10s
docker / builders (--build-arg FEDORA_VERSION=44, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm, -f44) (push) Successful in 9s
docker / builders-arm64cross (push) Skipped
ci / rust-arm64 (push) Successful in 1m22s
ci / web (push) Successful in 1m21s
ci / docs-site (push) Successful in 1m44s
flatpak / build-publish (push) Successful in 6m22s
ci / rust (push) Successful in 7m50s
docker / builders (ci/android-ci.Dockerfile, punktfunk-android-ci) (push) Successful in 12s
docker / builders (ci/arch-ci.Dockerfile, punktfunk-arch-ci) (push) Successful in 14s
docker / builders (ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Failing after 51s
docker / builders (ci/rust-ci-noble.Dockerfile, punktfunk-rust-ci-noble) (push) Successful in 8s
docker / builders (ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 12s
docker / apps (., web/Dockerfile, punktfunk-web) (push) Successful in 10s
docker / apps (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 14s
docker / deploy-docs (push) Failing after 10s
docker / builders (--build-arg FEDORA_VERSION=44, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm, -f44) (push) Successful in 9s
docker / builders-arm64cross (push) Skipped
Reviewed-on: #65
This commit was merged in pull request #65.
This commit is contained in:
@@ -251,12 +251,19 @@ modules:
|
||||
url: https://github.com/ValveSoftware/gamescope.git
|
||||
# KEEP IN SYNC with `_gsrev` in packaging/gamescope/PKGBUILD.
|
||||
commit: 8c676c399c761e4540587f61004c957993d12fea
|
||||
# Submodule + wrap pins as of that rev. `git ls-tree <rev> subprojects/` for the
|
||||
# submodules; subprojects/*.wrap for the rest.
|
||||
- type: git
|
||||
url: https://github.com/Joshua-Ashton/vkroots.git
|
||||
commit: 5106d8a0df95de66cc58dc1ea37e69c99afc9540
|
||||
dest: subprojects/vkroots
|
||||
# Wrap pins as of that rev (`subprojects/*.wrap`). These are meson WRAPS, not gamescope
|
||||
# submodules, so nothing else populates them and they need explicit sources.
|
||||
#
|
||||
# vkroots is deliberately NOT listed here. It is a real gamescope SUBMODULE, and
|
||||
# flatpak-builder clones git sources with submodules by default — so it is already
|
||||
# checked out at exactly the rev above (`git ls-tree <rev> subprojects/vkroots`), which
|
||||
# leaves `subprojects/vkroots/.git` as a gitlink FILE. Declaring it again with
|
||||
# `dest: subprojects/vkroots` made the extractor copy the bare mirror onto that path and
|
||||
# die before any build command ran:
|
||||
# cp: cannot overwrite non-directory '.../subprojects/vkroots/.git' with directory
|
||||
# Re-adding it re-breaks the whole flatpak. If the submodule ever needs to be pinned away
|
||||
# from the gamescope rev, set `disable-submodules: true` on the source above and then
|
||||
# declare ALL THREE subprojects explicitly — not one of them alone.
|
||||
- type: git
|
||||
url: https://github.com/g-truc/glm.git
|
||||
commit: 0af55ccecd98d4e5a8d1fad7de25ba429d60e863
|
||||
|
||||
Reference in New Issue
Block a user