From 5ae15532f0a1b0b453009b7b8ce4fbd58782bf93 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 16 Nov 2023 14:58:55 +0800 Subject: [PATCH] fetch_srclib: fetch source code --- .gitlab-ci.yml | 2 +- examples/fdroid_fetchsrclibs.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c641e748..c801539f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -438,7 +438,7 @@ plugin_fetchsrclibs: - curl https://gitlab.com/fdroid/fdroiddata/-/archive/${commitid}/fdroiddata-${commitid}.tar.gz | tar -xz --directory=fdroiddata --strip-components=1 - cd fdroiddata - - fdroid fetchsrclibs freemap.opentrail:9 --verbose + - fdroid fetchsrclibs freemap.opentrail:4 --verbose - test -d build/freemap.opentrail/.git - test -d build/srclib/andromaps/.git - test -d build/srclib/freemaplib/.git diff --git a/examples/fdroid_fetchsrclibs.py b/examples/fdroid_fetchsrclibs.py index 76e8bc8e..978baacf 100644 --- a/examples/fdroid_fetchsrclibs.py +++ b/examples/fdroid_fetchsrclibs.py @@ -29,8 +29,12 @@ def main(): srclibpaths = [] for appid, app in apps.items(): vcs, _ignored = common.setup_vcs(app) - vcs.gotorevision('HEAD', refresh=False) for build in app.get('Builds', []): + vcs.gotorevision(build.commit, refresh=False) + if build.submodules: + vcs.initsubmodules() + else: + vcs.deinitsubmodules() for lib in build.srclibs: srclibpaths.append(common.getsrclib(lib, srclib_dir, prepare=False, build=build)) print('Set up srclibs:')