diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb6191d24c374bb7bfe0994a8cfb82a1b9209268..189aaf3a2dfc1f5e9710e7a58f5b0f357ecf8749 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ job: - echo "man-db man-db/auto-update boolean false" | debconf-set-selections - export DEBIAN_FRONTEND=noninteractive - apt-get -y update - - apt-get -y install python3-yaml + - apt-get -y install python3-yaml make script: - - python3 -c 'import yaml; import pprint; c = yaml.load(open("librem5-pipeline-definitions.yml")); pprint.pprint(c)' + - make check diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..f468ec7cc03260f94709ac8823adf50f263d922a --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +check: + python3 -c 'import yaml; import pprint; c = yaml.load(open("librem5-pipeline-definitions.yml")); pprint.pprint(c)' diff --git a/librem5-pipeline-definitions.yml b/librem5-pipeline-definitions.yml index 69be82a8f83f0d37cb518d7a33100fe99bd3acae..27bf9f86096a8890caa983abae51f1c90e86bfcc 100644 --- a/librem5-pipeline-definitions.yml +++ b/librem5-pipeline-definitions.yml @@ -5,6 +5,7 @@ variables: L5_ADD_SCRATCH_CI: 'true' L5_WORKING_DIR: $CI_PROJECT_DIR/debian/output L5_LINTIAN_OPTS: --suppress-tags bad-distribution-in-changes-file + L5_GIT_SUBMODULE_UPDATE: 'true' .l5-build-debian-package: image: ${L5_DOCKER_IMAGE} @@ -15,12 +16,13 @@ variables: - echo "man-db man-db/auto-update boolean false" | debconf-set-selections - export DEBIAN_FRONTEND=noninteractive - apt-get -y update - - '[ "$L5_ADD_SCRATCH_CI" != "true" ] || apt-get -y install build-essential wget ca-certificates gnupg' + - '[ "$L5_ADD_SCRATCH_CI" != "true" ] || apt-get -y install build-essential wget ca-certificates gnupg git' - '[ "$L5_ADD_SCRATCH_CI" != "true" ] || echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list' - '[ "$L5_ADD_SCRATCH_CI" != "true" ] || wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -' - apt-get -y update - apt-get -y build-dep . script: + - '[ "$L5_GIT_SUBMODULE_UPDATE" != "true" ] || git submodule update --recursive' - dpkg-buildpackage -b -uc -us - rm -rf "${L5_WORKING_DIR}"; mkdir -p "${L5_WORKING_DIR}" - cp -l ../*.deb ../*.changes ../*.buildinfo "${L5_WORKING_DIR}/"