From 6211aa214fa828c0451f70c8ae8386c427f4bd5b Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 21 Feb 2020 09:33:38 +0100
Subject: [PATCH] [ci] Consistent naming.
---
.gitlab-ci.yml | 6 +++---
scripts/ci/extends/{build.yml => template-build-linux.yml} | 4 ++--
.../ci/extends/{build-win.yml => template-build-win.yml} | 4 ++--
scripts/ci/jobs/build-docs.yml | 2 +-
scripts/ci/jobs/build-gui-linux.yml | 2 +-
scripts/ci/jobs/build-gui-mac.yml | 2 +-
scripts/ci/jobs/build-gui-win.yml | 3 +--
scripts/ci/jobs/build-linux.yml | 2 +-
scripts/ci/jobs/build-mac.yml | 2 +-
scripts/ci/jobs/build-win.yml | 3 +--
10 files changed, 14 insertions(+), 16 deletions(-)
rename scripts/ci/extends/{build.yml => template-build-linux.yml} (93%)
rename scripts/ci/extends/{build-win.yml => template-build-win.yml} (93%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efc4ed59b47..b393a6e3897 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
stages:
- pre-checks
- - test
+ - build
- checks
- gui
- package
@@ -18,8 +18,8 @@ variables:
include:
# extends
- local: '/scripts/ci/extends/defaults.yml'
- - local: '/scripts/ci/extends/build.yml'
- - local: '/scripts/ci/extends/build-win.yml'
+ - local: '/scripts/ci/extends/template-build-linux.yml'
+ - local: '/scripts/ci/extends/template-build-win.yml'
- local: '/scripts/ci/extends/container-maker-setup.yml'
- local: '/scripts/ci/extends/vs2019-environment.yml'
- local: '/scripts/ci/extends/test-artifacts.yml'
diff --git a/scripts/ci/extends/build.yml b/scripts/ci/extends/template-build-linux.yml
similarity index 93%
rename from scripts/ci/extends/build.yml
rename to scripts/ci/extends/template-build-linux.yml
index 151b35da2a3..858d43427e7 100644
--- a/scripts/ci/extends/build.yml
+++ b/scripts/ci/extends/template-build-linux.yml
@@ -1,5 +1,5 @@
-.build_definition:
- stage: test
+.template-build-linux:
+ stage: build
extends:
- .defaults
- .test-artifacts
diff --git a/scripts/ci/extends/build-win.yml b/scripts/ci/extends/template-build-win.yml
similarity index 93%
rename from scripts/ci/extends/build-win.yml
rename to scripts/ci/extends/template-build-win.yml
index 1d92dfb277a..c552ba3ba63 100644
--- a/scripts/ci/extends/build-win.yml
+++ b/scripts/ci/extends/template-build-win.yml
@@ -1,5 +1,5 @@
-.build_win_definition:
- stage: test
+.template-build-win:
+ stage: build
tags:
- windows
diff --git a/scripts/ci/jobs/build-docs.yml b/scripts/ci/jobs/build-docs.yml
index c5a01dca71a..09dcb520e04 100644
--- a/scripts/ci/jobs/build-docs.yml
+++ b/scripts/ci/jobs/build-docs.yml
@@ -1,5 +1,5 @@
build docs:
- stage: test
+ stage: build
image:
name: $CONTAINER_GCC_IMAGE
diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml
index 5153bbbc059..20ce567f430 100644
--- a/scripts/ci/jobs/build-gui-linux.yml
+++ b/scripts/ci/jobs/build-gui-linux.yml
@@ -1,5 +1,5 @@
build gui linux:
- extends: .build_definition
+ extends: .template-build-linux
stage: gui
when: manual
diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml
index fd7ab390bf1..97872a125f6 100644
--- a/scripts/ci/jobs/build-gui-mac.yml
+++ b/scripts/ci/jobs/build-gui-mac.yml
@@ -1,5 +1,5 @@
build gui mac:
- extends: .build_definition
+ extends: .template-build-linux
stage: gui
tags:
- mac
diff --git a/scripts/ci/jobs/build-gui-win.yml b/scripts/ci/jobs/build-gui-win.yml
index c05fbc61187..d2bdbb6712c 100644
--- a/scripts/ci/jobs/build-gui-win.yml
+++ b/scripts/ci/jobs/build-gui-win.yml
@@ -1,6 +1,5 @@
build gui win:
- extends:
- - .build_win_definition
+ extends: .template-build-win
stage: gui
when: manual
diff --git a/scripts/ci/jobs/build-linux.yml b/scripts/ci/jobs/build-linux.yml
index 085ca745324..0e3f476b4ad 100644
--- a/scripts/ci/jobs/build-linux.yml
+++ b/scripts/ci/jobs/build-linux.yml
@@ -1,5 +1,5 @@
build linux:
- extends: .build_definition
+ extends: .template-build-linux
variables:
BUILD_DIR: "build"
diff --git a/scripts/ci/jobs/build-mac.yml b/scripts/ci/jobs/build-mac.yml
index a6b7c80c154..9fb1c555d20 100644
--- a/scripts/ci/jobs/build-mac.yml
+++ b/scripts/ci/jobs/build-mac.yml
@@ -1,5 +1,5 @@
build mac:
- extends: .build_definition
+ extends: .template-build-linux
tags:
- mac
diff --git a/scripts/ci/jobs/build-win.yml b/scripts/ci/jobs/build-win.yml
index 1bf70acb865..e80f7c49059 100644
--- a/scripts/ci/jobs/build-win.yml
+++ b/scripts/ci/jobs/build-win.yml
@@ -1,6 +1,5 @@
build win:
- extends:
- - .build_win_definition
+ extends: .template-build-win
variables:
BUILD_DIR: build-win
--
GitLab