summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2020-01-31 16:31:48 +0000
committerOlivier CrĂȘte <olivier.crete@collabora.com>2020-05-22 17:32:28 -0400
commit7a24981a82332ca0d367d16c797f6aad13637812 (patch)
tree1dafd4fa67bb35b1d07dcdbdbc8030af800a8715
parent1e4272b436ad1de4c473318399ac5185c92dfc55 (diff)
downloadlibnice-7a24981a82332ca0d367d16c797f6aad13637812.tar.gz
gitlab-ci: Rename tasks to not say meson
They're always meson now.
-rw-r--r--.gitlab-ci.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c5d3d07..567f329 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
- test
- deploy
-build meson:
+build:
stage: build
image: registry.freedesktop.org/libnice/libnice/centos7/meson-build
variables:
@@ -116,11 +116,11 @@ build msvc x86:
variables:
ARCH: 'x86'
-test meson:
+test:
stage: test
image: registry.freedesktop.org/libnice/libnice/centos7/meson-build
needs:
- - build meson
+ - build
except:
- schedules
script:
@@ -133,8 +133,8 @@ test meson:
- build/meson-logs/
-test valgrind meson:
- extends: test meson
+test valgrind:
+ extends: test
script:
- ifconfig
- source scl_source enable rh-python36 && true
@@ -142,11 +142,11 @@ test valgrind meson:
- meson test -C build/ --setup valgrind --print-errorlogs
-doc-and-install meson:
+doc-and-install:
stage: test
image: registry.freedesktop.org/libnice/libnice/centos7/meson-build
needs:
- - build meson
+ - build
except:
- schedules
variables:
@@ -186,7 +186,7 @@ submit-to-coverity:
pages:
stage: deploy
dependencies:
- - doc-and-install meson
+ - doc-and-install
only:
- latest-release
artifacts: