From 5f178563c5254524957a5e8da1cbc002f89a7085 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Mon, 5 Oct 2020 09:50:53 +0200 Subject: [PATCH] Move ubuntu18-04-cmake-test later in .gitlab-ci.yml The Linux CMake build jobs are kept together after all the autotools jobs and the test jobs should follow the same principle. --- .gitlab-ci.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82aa3cca1..7d6569076 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -366,20 +366,6 @@ ubuntu18-04-test: - linux image: "graphviz/graphviz:ubuntu-18.04" -ubuntu18-04-cmake-test: - <<: *test_definition - before_script: - - export build_system="cmake" - - echo experimental > COLLECTION - needs: - - job: portable-source - artifacts: true - - job: "ubuntu18-04-cmake-build" - artifacts: true - tags: - - linux - image: "graphviz/graphviz:ubuntu-18.04" - ubuntu19-10-test: <<: *test_definition before_script: @@ -510,6 +496,20 @@ fedora33-test: - linux image: "graphviz/graphviz:fedora33" +ubuntu18-04-cmake-test: + <<: *test_definition + before_script: + - export build_system="cmake" + - echo experimental > COLLECTION + needs: + - job: portable-source + artifacts: true + - job: "ubuntu18-04-cmake-build" + artifacts: true + tags: + - linux + image: "graphviz/graphviz:ubuntu-18.04" + deployment: stage: deploy script: -- 2.40.0