From 3e6b6a40956164320c8ed126df93d451bac00842 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 21 Jun 2021 21:38:06 +0100 Subject: [PATCH] CI: Rename job names to keep parameters first GitLab already groups our various stages (container, build, etc) into separate UI elements. Within those stages, the important information is the parameterisation (architecture, OS, toolchain). We don't want that to get ellipsised, so put that first in the job names. Signed-off-by: Daniel Stone --- .gitlab-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9f2a054..642f5671 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -173,7 +173,7 @@ container_prep: - $BUILDDIR/meson-logs - $PREFIX -build-full: +full-build: variables: MESON_OPTIONS: > -Doptimization=0 @@ -190,14 +190,14 @@ build-full: reports: cobertura: $BUILDDIR/meson-logs/coverage.xml -build-docs: +docs-build: variables: MESON_OPTIONS: > -Dwerror=true -Ddoc=true extends: .build-no-test -build-no-gl: +no-gl-build: variables: MESON_OPTIONS: > -Dsimple-clients=damage,im,shm,touch,dmabuf-v4l @@ -223,15 +223,15 @@ docs-and-coverage: stage: pages timeout: 5m script: - - mv prefix-weston-build-docs/share/doc/weston Documentation - - mv build-weston-build-full/meson-logs/coveragereport Test_Coverage + - mv prefix-weston-docs-build/share/doc/weston Documentation + - mv build-weston-full-build/meson-logs/coveragereport Test_Coverage - rm Test_Coverage/gcov.css - cp doc/style/lcov-style.css Test_Coverage/gcov.css - cp doc/style/*.png Test_Coverage/ - rm -rf build-* prefix-* dependencies: - - build-docs - - build-full + - docs-build + - full-build artifacts: expose_as: 'Documentation preview and test coverage report' paths: @@ -250,9 +250,9 @@ pages: stage: pages timeout: 5m dependencies: - - build-docs + - docs-build script: - - export PREFIX=$(pwd)/prefix-weston-build-docs + - export PREFIX=$(pwd)/prefix-weston-docs-build - mkdir public - cp -R $PREFIX/share/doc/weston/* public/ artifacts: