From d83397279ff52ae021c2666285b0c0136b4f657c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 14 Nov 2023 10:59:49 +0100 Subject: [PATCH] build: Switch gmobile to 0.0.4 We switch to a wrap which helps us to avoid the submodule --- .gitignore | 1 + .gitlab-ci.yml | 4 ---- .gitmodules | 2 +- subprojects/gmobile | 1 - subprojects/gmobile.wrap | 5 +++++ 5 files changed, 7 insertions(+), 6 deletions(-) delete mode 160000 subprojects/gmobile create mode 100644 subprojects/gmobile.wrap diff --git a/.gitignore b/.gitignore index 505f5f7..0a1c927 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ debian/libfeedback-0.0-0/ debian/libfeedback-dev.substvars debian/libfeedback-dev/ debian/tmp/ +subprojects/gmobile/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 256e96b..42cf82b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,10 +2,6 @@ include: - remote: 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml' - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/34039cd573a2df832d465bc9e4c5f543571f5241/templates/ci-fairy.yml' -variables: - GIT_SUBMODULE_STRATEGY: normal - GIT_SUBMODULE_DEPTH: 1 - stages: - build - test diff --git a/.gitmodules b/.gitmodules index fae72b7..fe9e9c5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "subprojects/gmobile"] path = subprojects/gmobile - url = https://gitlab.gnome.org/guidog/gmobile.git + url = https://gitlab.gnome.org/World/Phosh/gmobile.git diff --git a/subprojects/gmobile b/subprojects/gmobile deleted file mode 160000 index d483537..0000000 --- a/subprojects/gmobile +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d483537aee4778b114ce5d50c4c8a9f8d58337ed diff --git a/subprojects/gmobile.wrap b/subprojects/gmobile.wrap new file mode 100644 index 0000000..85901c3 --- /dev/null +++ b/subprojects/gmobile.wrap @@ -0,0 +1,5 @@ +[wrap-git] +directory=gmobile +url=https://gitlab.gnome.org/World/Phosh/gmobile.git +revision=v0.0.4 +depth=1