From c93230dab9b6e4dec984f46ca66f152a1e9dfca3 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 28 May 2020 10:06:25 +0200
Subject: [PATCH] [CI] Fix runner tags
---
scripts/ci/extends/template-build-dockerfile.yml | 1 -
scripts/ci/extends/template-build-linux.yml | 2 +-
scripts/ci/extends/template-build-win.yml | 3 ---
scripts/ci/jobs/build-gui-mac.yml | 1 -
scripts/ci/jobs/build-mac.yml | 1 -
scripts/ci/jobs/build_image.yml | 5 ++---
scripts/ci/jobs/check-header.yml | 2 +-
scripts/ci/jobs/checks.yml | 1 -
8 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/scripts/ci/extends/template-build-dockerfile.yml b/scripts/ci/extends/template-build-dockerfile.yml
index 7bbc61f4bb3..8a8404325f9 100644
--- a/scripts/ci/extends/template-build-dockerfile.yml
+++ b/scripts/ci/extends/template-build-dockerfile.yml
@@ -15,7 +15,6 @@
- scripts/ci/extends/template-build-dockerfile.yml
tags:
- docker-shell
- - ogs
variables:
GIT_LFS_SKIP_SMUDGE: "1"
script:
diff --git a/scripts/ci/extends/template-build-linux.yml b/scripts/ci/extends/template-build-linux.yml
index 65f30af4592..51c5f2c52e1 100644
--- a/scripts/ci/extends/template-build-linux.yml
+++ b/scripts/ci/extends/template-build-linux.yml
@@ -1,7 +1,7 @@
.template-build-linux:
stage: build
tags:
- - ogs
+ - docker
extends:
- .defaults
- .test-artifacts
diff --git a/scripts/ci/extends/template-build-win.yml b/scripts/ci/extends/template-build-win.yml
index 9bf3730e691..8d0b4b68c37 100644
--- a/scripts/ci/extends/template-build-win.yml
+++ b/scripts/ci/extends/template-build-win.yml
@@ -1,10 +1,7 @@
.template-build-win:
stage: build
-
tags:
- windows
- - ogs
-
extends:
- .defaults
- .vs2019-environment
diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml
index ed69271f91b..5ef942411a7 100644
--- a/scripts/ci/jobs/build-gui-mac.yml
+++ b/scripts/ci/jobs/build-gui-mac.yml
@@ -6,7 +6,6 @@ build gui mac:
artifacts: false
tags:
- mac
- - ogs
rules:
- if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
- changes:
diff --git a/scripts/ci/jobs/build-mac.yml b/scripts/ci/jobs/build-mac.yml
index 41d5edd9a1b..9fb1c555d20 100644
--- a/scripts/ci/jobs/build-mac.yml
+++ b/scripts/ci/jobs/build-mac.yml
@@ -3,7 +3,6 @@ build mac:
tags:
- mac
- - ogs
variables:
BUILD_DIR: "build-mac"
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index 364f741219f..aa17fe50c23 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -8,7 +8,7 @@ build gcc images:
when: always
tags:
- docker-shell
- - ogs
+
variables:
GIT_LFS_SKIP_SMUDGE: "1"
extends: .container-maker-setup
@@ -33,7 +33,7 @@ build xunit-to-junit image:
- scripts/ci/jobs/build_image.yml
tags:
- docker-shell
- - ogs
+
variables:
GIT_LFS_SKIP_SMUDGE: "1"
script:
@@ -52,7 +52,6 @@ build pre-commit image:
- scripts/ci/jobs/build_image.yml
tags:
- docker-shell
- - ogs
variables:
GIT_LFS_SKIP_SMUDGE: "1"
script:
diff --git a/scripts/ci/jobs/check-header.yml b/scripts/ci/jobs/check-header.yml
index 81563fafea5..35722b153d3 100644
--- a/scripts/ci/jobs/check-header.yml
+++ b/scripts/ci/jobs/check-header.yml
@@ -1,7 +1,7 @@
check header:
stage: checks
tags:
- - ogs
+ - docker
extends:
- .defaults
- .rules-master-manual
diff --git a/scripts/ci/jobs/checks.yml b/scripts/ci/jobs/checks.yml
index 83feb040d93..206ae587954 100644
--- a/scripts/ci/jobs/checks.yml
+++ b/scripts/ci/jobs/checks.yml
@@ -24,7 +24,6 @@ ctest results:
GIT_STRATEGY: none
tags:
- docker-shell
- - ogs
needs:
- job: build linux
- job: build win
--
GitLab