diff --git a/plugins.gitlab-ci.yml b/plugins.gitlab-ci.yml index 75abee9e8d4a928c7dbfc180aee1fd298c548c4c..e4c07f9f863b1eb068914ed94b04b2e56e37afbc 100644 --- a/plugins.gitlab-ci.yml +++ b/plugins.gitlab-ci.yml @@ -61,11 +61,11 @@ Build_Windows: - job: "Generate_Project" artifacts: true -Build_CentOS: +Build_Linux: only: ['web', 'schedules'] - extends: .Build_CentOS_ + extends: .Build_Linux_ tags: - - centos + - linux - unreal-4.26 variables: GIT_STRATEGY: none @@ -75,17 +75,18 @@ Build_CentOS: needs: - job: "Generate_Project" artifacts: true - -#Deploy_CAVE: -# only: ['web', 'schedules'] -# extends: .Deploy_CAVE_ -# needs: -# - job: "Build_CentOS" -# artifacts: true -# + #Deploy_Windows: # only: ['web', 'schedules'] # extends: .Deploy_VRDev_ # needs: # - job: "Build_Windows" +# artifacts: true +# +#Deploy_CAVE: +# only: ['web', 'schedules'] +# extends: .Deploy_CAVE_ +# needs: +# - job: "Build_Linux" # artifacts: true +# diff --git a/project.gitlab-ci.yml b/project.gitlab-ci.yml index b960e4691e9cb516f3cae4c47f20937ae744ed95..f1365b07b325ebbb60a21d2055f597e0b5138e9e 100644 --- a/project.gitlab-ci.yml +++ b/project.gitlab-ci.yml @@ -36,24 +36,27 @@ Build_Windows: CLIENT_CONFIG: "DebugGame" # CLIENT_CONFIG: "Shipping" -Build_CentOS: +Build_Linux: only: ['web', 'schedules'] - extends: .Build_CentOS_ + extends: .Build_Linux_ tags: - - centos + - linux - unreal-4.26 variables: CLIENT_CONFIG: "DebugGame" # CLIENT_CONFIG: "Shipping" - -Deploy_CAVE: - only: ['web', 'schedules'] - extends: .Deploy_CAVE_ - dependencies: - - Build_CentOS - + Deploy_Windows: only: ['web', 'schedules'] extends: .Deploy_VRDev_ - dependencies: - - Build_Windows + needs: + - job: "Build_Windows" + artifacts: true + +Deploy_CAVE: + only: ['web', 'schedules'] + extends: .Deploy_CAVE_ + needs: + - job: "Build_Linux" + artifacts: true + diff --git a/shared_scripts.yml b/shared_scripts.yml index 964644fe0575c7b65e9beed68d76a8639ffcdfdc..f2a83ab4d452facaefcc09a0d9f0cd00e8a94572 100644 --- a/shared_scripts.yml +++ b/shared_scripts.yml @@ -21,7 +21,8 @@ variables: - web - schedules tags: - - centos + - linux + - project-generation variables: GEN_TEMPLATE_REPO: "https://git-ce.rwth-aachen.de/vr-vis/VR-Group/unreal-development/unrealprojecttemplate.git" GEN_TEMPLATE_BRANCH: "4.26" @@ -58,7 +59,7 @@ variables: EXTRA_ARGS: "" tags: - windows - - unreal-4.22 + - unreal-4.26 script: # Clean folder before building - git clean -qxfdf; git submodule foreach --quiet --recursive git clean -qxfdf @@ -97,7 +98,7 @@ variables: ##################################Linux################################## -.Build_CentOS_: +.Build_Linux_: stage: build variables: GIT_STRATEGY: clone @@ -105,8 +106,8 @@ variables: CLIENT_CONFIG: "Shipping" EXTRA_ARGS: "" tags: - - centos - - unreal-4.22 + - linux + - unreal-4.26 script: # Clean folder before building - git clean -qxfdf && git submodule foreach --quiet --recursive git clean -qxfdf @@ -149,7 +150,7 @@ variables: .Deploy_VRDev_: stage: deploy tags: - - centos + - linux - networkdeploy allow_failure: true script: @@ -170,7 +171,7 @@ variables: .Deploy_CAVE_: stage: deploy tags: - - centos + - linux - networkdeploy allow_failure: true script: