From 4ac835be5e361d21f322737d934877924afb3774 Mon Sep 17 00:00:00 2001
From: David Gilbert <david.gilbert@rwth-aachen.de>
Date: Tue, 23 Jan 2024 13:15:06 +0100
Subject: [PATCH] ci: small cleanup
---
.gitlab-ci.yml | 28 ++--------------------------
1 file changed, 2 insertions(+), 26 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e53e5dd..87e1531 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,20 +83,12 @@ Generate_Project:
)"
Generate_Project_Without_Toolkit:
- rules:
- - if: $CI_PIPELINE_SOURCE == "web"
- - if: $CI_PIPELINE_SOURCE == "schedule"
- - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
- - if: $CI_COMMIT_TAG
- - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- extends: .Generate_Project_
+ extends: Generate_Project
variables:
- RUN_SETUP: "false"
GEN_DEPENDENCIES: "(
[master@UnrealDTrackPlugin]='https://github.com/VRGroupRWTH/UnrealDTrackPlugin.git'
)"
-
Build_Windows:
rules:
- if: $CI_PIPELINE_SOURCE == "web"
@@ -138,24 +130,8 @@ Build_Linux:
- job: "Generate_Project"
artifacts: true
-
Build_Linux_Without_Toolkit:
- rules:
- - if: $CI_PIPELINE_SOURCE == "web"
- - if: $CI_PIPELINE_SOURCE == "schedule"
- - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
- - if: $CI_COMMIT_TAG
- - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- extends: .Build_Linux_
- tags:
- - linux
- - unreal
- - docker-executor
- variables:
- GIT_STRATEGY: none
- GIT_CHECKOUT: "false"
- # CLIENT_CONFIG: "Shipping"
- CLIENT_CONFIG: "DebugGame"
+ extends: Build_Linux
needs:
- job: "Generate_Project_Without_Toolkit"
artifacts: true
--
GitLab