From aa8c1b571d4901135539092a247c91d955a89e8a Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Fri, 7 Feb 2025 10:26:06 +0100 Subject: [PATCH] ci: Use GNOME release pipeline And ensure we include subprojects in the tarball while we're at it. Part-of: --- .gitlab-ci.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32354ec..c8c1660 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,11 @@ include: - project: 'guidog/meta-phosh' ref: '2aeb9bfe2b230ca3aeda8275e42c95f94f6723ca' file: '/ci/phosh-common-jobs.yml' + - component: "gitlab.gnome.org/GNOME/citemplates/release-service@master" + inputs: + job-stage: "deploy" + dist-job-name: "build:tarball" + tarball-artifact-path: "${TARBALL_ARTIFACT_PATH}" stages: - build @@ -24,6 +29,8 @@ workflow: variables: DEBIAN_IMAGE: $CI_REGISTRY/gnome/calls/debian:v0.0.2024-11-10 GIT_SUBMODULE_STRATEGY: normal + MESON_BUILD_DIR: "_build" + TARBALL_ARTIFACT_PATH: "${MESON_BUILD_DIR}/meson-dist/${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.xz" build:native: stage: build @@ -49,11 +56,12 @@ build:tarball: image: "${DEBIAN_IMAGE}" tags: [] artifacts: + name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" paths: - - _build/meson-dist + - "${TARBALL_ARTIFACT_PATH}" script: - - meson setup . _build - - xvfb-run -s -noreset meson dist -C _build + - meson setup . "${MESON_BUILD_DIR}" + - xvfb-run -s -noreset meson dist --include-subprojects -C "${MESON_BUILD_DIR}" only: - tags