diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2021-06-15 18:23:33 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-07-09 10:24:41 +0000 |
| commit | f5e6674f9873d75d56b84af13bb8f1445312a40d (patch) | |
| tree | 0af054ba5e30003b1a3647c4e11b2931947d1f93 /.gitlab-ci | |
| parent | df185ae030805a440bc6f6a48d8d9025fa8768bd (diff) | |
ci: Rename Debian based build jobs from meson-* to debian-*
meson has been the only build system in tree for some time, so the
meson- prefix was a bit meaningless.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11412>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/lava/lava-gitlab-ci.yml | 8 | ||||
| -rwxr-xr-x | .gitlab-ci/meson/build.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index b6a938ec2cb..7f7b389854f 100755 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -46,7 +46,7 @@ needs: - kernel+rootfs_armhf - debian/x86_build - - meson-armhf + - debian-armhf .lava-test:arm64: variables: @@ -61,11 +61,11 @@ - .lava-test - .use-kernel+rootfs-arm dependencies: - - meson-arm64 + - debian-arm64 needs: - kernel+rootfs_arm64 - debian/x86_build - - meson-arm64 + - debian-arm64 .lava-test:amd64: variables: @@ -81,7 +81,7 @@ - .use-kernel+rootfs-amd64 needs: - kernel+rootfs_amd64 - - meson-testing + - debian-testing .lava-traces-base: variables: diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh index 31a518bc787..56391e51c80 100755 --- a/.gitlab-ci/meson/build.sh +++ b/.gitlab-ci/meson/build.sh @@ -44,7 +44,7 @@ fi case $CI_JOB_NAME in # strace and wine don't seem to mix well # ASAN leak detection is incompatible with strace - meson-mingw32-x86_64|*-asan*) + debian-mingw32-x86_64|*-asan*) if test -f /usr/bin/time; then MESON_TEST_ARGS+=--wrapper=$PWD/.gitlab-ci/meson/time.sh fi |