From f6770f4fb808f8a647010cb9bf22ebb3416cd13e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 3 Jul 2020 10:35:55 +0200
Subject: [PATCH] [ci] Move gui jobs to build stage.
---
.gitlab-ci.yml | 2 --
scripts/ci/jobs/build-gui-linux.yml | 2 +-
scripts/ci/jobs/build-gui-mac.yml | 6 ++----
scripts/ci/jobs/build-gui-win.yml | 3 +--
scripts/ci/jobs/meta.yml | 2 --
5 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29bf2c3476b..d4753b8eaa2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,8 @@ stages:
- preparation
- build
- check
- - gui
- package
-
variables:
# Docker image names
CONTAINER_GCC_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/gcc
diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml
index be06bc9f320..cec5e39f7a7 100644
--- a/scripts/ci/jobs/build-gui-linux.yml
+++ b/scripts/ci/jobs/build-gui-linux.yml
@@ -1,6 +1,6 @@
build gui linux:
extends: .template-build-linux
- stage: gui
+ stage: build
image:
name: $CONTAINER_GCC_GUI_IMAGE
tags:
diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml
index 6d519473c7c..1a6de27afbb 100644
--- a/scripts/ci/jobs/build-gui-mac.yml
+++ b/scripts/ci/jobs/build-gui-mac.yml
@@ -1,15 +1,13 @@
build gui mac:
extends: .template-build-linux
- stage: gui
- tags:
- - mac
+ stage: build
+ tags: [mac]
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- changes:
- Applications/DataExplorer/**/*
- when: manual
allow_failure: true
-
variables:
BUILD_DIR: "build-gui-mac"
BUILD_CTEST: "false"
diff --git a/scripts/ci/jobs/build-gui-win.yml b/scripts/ci/jobs/build-gui-win.yml
index 13d94a8b8de..9c69d72cb07 100644
--- a/scripts/ci/jobs/build-gui-win.yml
+++ b/scripts/ci/jobs/build-gui-win.yml
@@ -1,13 +1,12 @@
build gui win:
extends: .template-build-win
- stage: gui
+ stage: build
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- changes:
- Applications/DataExplorer/**/*
- when: manual
allow_failure: true
-
variables:
BUILD_DIR: build-gui-win
BUILD_CTEST: "false"
diff --git a/scripts/ci/jobs/meta.yml b/scripts/ci/jobs/meta.yml
index 0abac260b93..8c92c2c4623 100644
--- a/scripts/ci/jobs/meta.yml
+++ b/scripts/ci/jobs/meta.yml
@@ -1,7 +1,6 @@
meta:
stage: .pre
tags: [shell]
- - shell
script:
- git fetch --depth 500
- echo "OGS_VERSION=${CI_COMMIT_TAG:-`git describe --tags --long --dirty --always`}" >> build.env
@@ -12,7 +11,6 @@ meta:
meta_container:
stage: .pre
- tags: [shell]
rules:
- changes:
- ThirdParty/container-maker
--
GitLab