ci: Use the same build job for creating the dist tarball as well

We don't need two jobs and its fine to always run meson dist
This commit is contained in:
Jordan Petridis 2025-07-01 12:35:12 +03:00
parent 07c9c9df9c
commit 0dc27cd01d

View file

@ -1,18 +1,9 @@
include:
- project: "GNOME/citemplates"
file: "templates/default-rules.yml"
- component: "gitlab.gnome.org/GNOME/citemplates/release-service@master"
inputs:
job-stage: "release"
dist-job-name: "build-release-tarball"
tarball-artifact-path: "${TARBALL_ARTIFACT_PATH}"
stages:
- build
- release
- pages
variables:
MESON_BUILD_DIR: "_build"
TARBALL_ARTIFACT_PATH: "${MESON_BUILD_DIR}/meson-dist/${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.xz"
dist-job-name: "build"
build:
image: registry.gitlab.gnome.org/gnome/blueprint-compiler
@ -34,11 +25,14 @@ build:
- git checkout 5f9e155c1333e84e6f683cdb26b02a5925fd8db3
- ./test.sh
- cd ..
- meson dist -C _build --include-subprojects --no-tests
- cp -r "_build/meson-dist/" "${CI_PROJECT_DIR}/public-dist/"
coverage: '/TOTAL.*\s([.\d]+)%/'
artifacts:
paths:
- _build
- htmlcov
- public-dist
reports:
coverage_report:
coverage_format: cobertura
@ -57,20 +51,8 @@ fuzz:
- corpus
- crashes
build-release-tarball:
stage: build
image: registry.gitlab.gnome.org/gnome/blueprint-compiler
script:
- meson setup "${MESON_BUILD_DIR}"
- xvfb-run meson dist -C "${MESON_BUILD_DIR}" --include-subprojects
artifacts:
name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
when: "always"
paths:
- "${TARBALL_ARTIFACT_PATH}"
pages:
stage: pages
stage: deploy
dependencies:
- build
script: