CI: shorten job names

The old job names were really long, so long that Gitlab web UI had to
almost always ellipsize them, showing only the beginning which is the
same fof the two and hiding the part that actually matters.

Rename the templates and the jobs to be shorter and more descriptive.
Meson is the only tool we build with. All builds are native. Default
options is a long way to say full-featured and besides libseat was not
even default yet we build it.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2021-05-12 17:08:29 +03:00 committed by Daniel Stone
parent 4a644e34d9
commit 7baece632f

View File

@ -31,7 +31,7 @@ container_prep:
stage: container_prep stage: container_prep
.build-native: .build-env:
extends: extends:
- .debian - .debian
- .fdo.distribution-image@debian - .fdo.distribution-image@debian
@ -56,8 +56,8 @@ container_prep:
- export TESTS_RES_PATH="$BUILDDIR/tests-res.txt" - export TESTS_RES_PATH="$BUILDDIR/tests-res.txt"
- mkdir "$BUILDDIR" "$PREFIX" - mkdir "$BUILDDIR" "$PREFIX"
.build-native-meson: .build-and-test:
extends: .build-native extends: .build-env
tags: tags:
- kvm - kvm
script: script:
@ -83,8 +83,8 @@ container_prep:
reports: reports:
junit: $BUILDDIR/meson-logs/testlog.junit.xml junit: $BUILDDIR/meson-logs/testlog.junit.xml
.build-native-meson-no-test: .build-no-test:
extends: .build-native extends: .build-env
tags: tags:
- kvm - kvm
script: script:
@ -101,7 +101,7 @@ container_prep:
- $BUILDDIR/meson-logs - $BUILDDIR/meson-logs
- $PREFIX - $PREFIX
build-native-meson-default-options: build-full:
variables: variables:
MESON_OPTIONS: > MESON_OPTIONS: >
-Doptimization=0 -Doptimization=0
@ -109,11 +109,11 @@ build-native-meson-default-options:
-Dwerror=true -Dwerror=true
-Dtest-skip-is-failure=true -Dtest-skip-is-failure=true
-Dlauncher-libseat=true -Dlauncher-libseat=true
extends: .build-native-meson extends: .build-and-test
after_script: after_script:
- ninja -C "$BUILDDIR" coverage-html > "$BUILDDIR/meson-logs/ninja-coverage-html.txt" - ninja -C "$BUILDDIR" coverage-html > "$BUILDDIR/meson-logs/ninja-coverage-html.txt"
- ninja -C "$BUILDDIR" coverage-xml - ninja -C "$BUILDDIR" coverage-xml
- sed -i -e 's/\/build-weston-build-native-meson-default-options//' -e 's/\"..\//\"/' "$BUILDDIR/meson-logs/coverage.xml" - sed -i -e 's/\/build-weston-build-full//' -e 's/\"..\//\"/' "$BUILDDIR/meson-logs/coverage.xml"
artifacts: artifacts:
reports: reports:
cobertura: $BUILDDIR/meson-logs/coverage.xml cobertura: $BUILDDIR/meson-logs/coverage.xml
@ -123,9 +123,9 @@ build-docs:
MESON_OPTIONS: > MESON_OPTIONS: >
-Dwerror=true -Dwerror=true
-Ddoc=true -Ddoc=true
extends: .build-native-meson-no-test extends: .build-no-test
build-native-meson-no-gl-renderer: build-no-gl:
variables: variables:
MESON_OPTIONS: > MESON_OPTIONS: >
-Dsimple-clients=damage,im,shm,touch,dmabuf-v4l -Dsimple-clients=damage,im,shm,touch,dmabuf-v4l
@ -134,21 +134,21 @@ build-native-meson-no-gl-renderer:
-Dpipewire=false -Dpipewire=false
-Dwerror=true -Dwerror=true
-Dlauncher-libseat=true -Dlauncher-libseat=true
extends: .build-native-meson extends: .build-and-test
docs-and-coverage: docs-and-coverage:
stage: pages stage: pages
timeout: 5m timeout: 5m
script: script:
- mv prefix-weston-build-docs/share/doc/weston Documentation - mv prefix-weston-build-docs/share/doc/weston Documentation
- mv build-weston-build-native-meson-default-options/meson-logs/coveragereport Test_Coverage - mv build-weston-build-full/meson-logs/coveragereport Test_Coverage
- rm Test_Coverage/gcov.css - rm Test_Coverage/gcov.css
- cp doc/style/lcov-style.css Test_Coverage/gcov.css - cp doc/style/lcov-style.css Test_Coverage/gcov.css
- cp doc/style/*.png Test_Coverage/ - cp doc/style/*.png Test_Coverage/
- rm -rf build-* prefix-* - rm -rf build-* prefix-*
dependencies: dependencies:
- build-docs - build-docs
- build-native-meson-default-options - build-full
artifacts: artifacts:
expose_as: 'Documentation preview and test coverage report' expose_as: 'Documentation preview and test coverage report'
paths: paths: