[cairo-commit] 2 commits - .gitlab-ci.yml
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Jul 29 10:00:59 UTC 2023
.gitlab-ci.yml | 70 ++++++++++++++++++++++++++++-----------------------------
1 file changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 00d8d3117d732d0e1d9fe96c7dde2f8f20dafa71
Merge: 89f272e3d 711f71e21
Author: Tim-Philipp Müller <tim at centricular.com>
Date: Sat Jul 29 10:00:57 2023 +0000
Merge branch 'ci-remove-meson-prefix-from-job-names' into 'master'
ci: remove meson from job names
See merge request cairo/cairo!499
commit 711f71e21d833013998831d879f427cd3deac1e0
Author: Tim-Philipp Müller <tim at centricular.com>
Date: Sat Jul 29 10:17:01 2023 +0100
ci: remove meson from job names
Autotools is gone after all, it's all meson now.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bac6f6005..65549c83e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,11 +98,11 @@ fedora image:
fonttools
util-linux
-.test fedora meson:
+.test fedora:
dependencies:
- - 'fedora meson build'
+ - 'fedora build'
needs:
- - 'fedora meson build'
+ - 'fedora build'
extends:
- '.fdo.distribution-image at fedora'
- '.ccache_setup'
@@ -119,14 +119,14 @@ fedora image:
- "builddir/test/**/*.cs"
- "builddir/test/**/*.trace"
-fedora meson build check-refs.sh:
- extends: '.test fedora meson'
+fedora build check-refs.sh:
+ extends: '.test fedora'
script:
# Check for duplicate reference images
- ./test/check-refs.sh "$(pwd)/builddir/test/pdiff/perceptualdiff"
-test fedora meson pdf:
- extends: '.test fedora meson'
+test fedora pdf:
+ extends: '.test fedora'
script:
- export CAIRO_TEST_IGNORE_pdf_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-pdf-argb32.txt)
- export CAIRO_TEST_IGNORE_pdf_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-pdf-rgb24.txt)
@@ -134,8 +134,8 @@ test fedora meson pdf:
- export srcdir=../../test
- (cd builddir/test && xvfb-run ./cairo-test-suite)
-test fedora meson ps2:
- extends: '.test fedora meson'
+test fedora ps2:
+ extends: '.test fedora'
script:
- export CAIRO_TEST_IGNORE_ps2_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-ps2-argb32.txt)
- export CAIRO_TEST_IGNORE_ps2_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-ps2-rgb24.txt)
@@ -144,8 +144,8 @@ test fedora meson ps2:
- export srcdir=../../test
- (cd builddir/test && xvfb-run ./cairo-test-suite)
-test fedora meson ps3:
- extends: '.test fedora meson'
+test fedora ps3:
+ extends: '.test fedora'
script:
- export CAIRO_TEST_IGNORE_ps3_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-ps3-argb32.txt)
- export CAIRO_TEST_IGNORE_ps3_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-ps3-rgb24.txt)
@@ -154,8 +154,8 @@ test fedora meson ps3:
- export srcdir=../../test
- (cd builddir/test && xvfb-run ./cairo-test-suite)
-test fedora meson script:
- extends: '.test fedora meson'
+test fedora script:
+ extends: '.test fedora'
script:
- export CAIRO_TEST_UGLY_HACK_TO_SOMETIMES_IGNORE_SCRIPT_XCB_HUGE_IMAGE_SHM=1
- export CAIRO_TEST_IGNORE_script_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-script-argb32.txt)
@@ -163,8 +163,8 @@ test fedora meson script:
- export srcdir=../../test
- (cd builddir/test && xvfb-run ./cairo-test-suite)
-test fedora meson image:
- extends: '.test fedora meson'
+test fedora image:
+ extends: '.test fedora'
script:
- export CAIRO_TEST_IGNORE_image_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-image-argb32.txt)
- export CAIRO_TEST_IGNORE_image_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-image-rgb24.txt)
@@ -173,8 +173,8 @@ test fedora meson image:
- export srcdir=../../test
- (cd builddir/test && xvfb-run ./cairo-test-suite)
-test fedora meson recording:
- extends: '.test fedora meson'
+test fedora recording:
+ extends: '.test fedora'
script:
- export CAIRO_TEST_IGNORE_recording_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-recording-argb32.txt)
- export CAIRO_TEST_IGNORE_recording_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-recording-rgb24.txt)
@@ -182,8 +182,8 @@ test fedora meson recording:
- export srcdir=../../test
- (cd builddir/test && xvfb-run ./cairo-test-suite)
-test fedora meson svg:
- extends: '.test fedora meson'
+test fedora svg:
+ extends: '.test fedora'
script:
- export CAIRO_TEST_IGNORE_svg11_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-svg11-argb32.txt)
- export CAIRO_TEST_IGNORE_svg11_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-svg11-rgb24.txt)
@@ -195,8 +195,8 @@ test fedora meson svg:
- export srcdir=../../test
- (cd builddir/test && xvfb-run ./cairo-test-suite)
-test fedora meson xcb:
- extends: '.test fedora meson'
+test fedora xcb:
+ extends: '.test fedora'
script:
- export CAIRO_TEST_IGNORE_xcb_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-argb32.txt)
- export CAIRO_TEST_IGNORE_xcb_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-rgb24.txt)
@@ -209,8 +209,8 @@ test fedora meson xcb:
- export srcdir=../../test
- (cd builddir/test && xvfb-run ./cairo-test-suite)
-test fedora meson xlib:
- extends: '.test fedora meson'
+test fedora xlib:
+ extends: '.test fedora'
script:
- export CAIRO_TEST_IGNORE_xlib_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-argb32.txt)
- export CAIRO_TEST_IGNORE_xlib_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-rgb24.txt)
@@ -221,7 +221,7 @@ test fedora meson xlib:
- export srcdir=../../test
- (cd builddir/test && xvfb-run ./cairo-test-suite)
-fedora meson build:
+fedora build:
extends:
- '.fdo.distribution-image at fedora'
- '.ccache_setup'
@@ -253,7 +253,7 @@ fedora meson build:
paths:
- "*"
-meson mingw-32 build:
+mingw-32 build:
extends:
- '.fdo.distribution-image at fedora'
stage: 'build'
@@ -272,7 +272,7 @@ meson mingw-32 build:
paths:
- 'builddir/meson-logs/'
-meson mingw-64 build:
+mingw-64 build:
extends:
- '.fdo.distribution-image at fedora'
stage: 'build'
@@ -292,7 +292,7 @@ meson mingw-64 build:
- 'builddir/meson-logs/'
# Based on https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-ci.yml (.build windows)
-.build meson windows:
+.build windows:
image: $WINDOWS_IMAGE
stage: 'build'
tags:
@@ -336,25 +336,25 @@ meson mingw-64 build:
meson build $env:MESON_ARGS &&
ninja -C build"
-meson vs2019 shared amd64:
- extends: '.build meson windows'
+vs2019 shared amd64:
+ extends: '.build windows'
variables:
ARCH: 'amd64'
EXTRA_MESON_ARGS: '--default-library=shared'
-meson vs2019 static amd64:
- extends: '.build meson windows'
+vs2019 static amd64:
+ extends: '.build windows'
variables:
ARCH: 'amd64'
EXTRA_MESON_ARGS: '--default-library=static'
-meson vs2019 shared x86:
- extends: '.build meson windows'
+vs2019 shared x86:
+ extends: '.build windows'
variables:
ARCH: 'x86'
EXTRA_MESON_ARGS: '--default-library=shared'
-meson android arm64 fedora:
+android arm64 fedora:
# TODO: should probably build our own image here some day
# See https://gitlab.freedesktop.org/gstreamer/gstreamer/container_registry/7689 for current images
image: 'registry.freedesktop.org/gstreamer/gstreamer/amd64/android-fedora:2020-10-22.0-master'
@@ -397,7 +397,7 @@ meson android arm64 fedora:
- meson setup --cross-file android-cross-file.txt -Dpixman:a64-neon=disabled build
- meson compile --verbose -C build
-meson macOS:
+macOS x86 host:
tags:
- gst-macos-12.3
stage: 'build'
More information about the cairo-commit
mailing list