Merge branch 'feature/plugin_pipeline_setup' into 'master'

Feature/plugin pipeline setup

See merge request VR-Group/unreal-development/unreal-ci!25

plugins.gitlab-ci.yml

@@ -7,7 +7,7 @@
 
 include:
   - project: 'vr-group/unreal-development/unreal-ci'
-    ref: feature/plugin_project_generation 
+    ref: master 
     file: '/shared_scripts.yml'
     
 # In this file you are able to configure your plugins pipeline.
@@ -31,7 +31,7 @@ include:
 #        GEN_TEMPLATE_BRANCH: "develop"
 #        GEN_DEPENDENCIES: "(
 #            [master@nDisplayExtensions]='https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/ndisplayextensions.git'
-#            [master@CaveOverlay]='https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/unreal-cave-overlay.git'
+#            [master@UniversalLogging]='https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/universallogging.git'
 #        )"
 #
 # You can uncomment the deploy lines to deploy your project to the CAVE/VRDev. This only makes sense, if your plugin works
@@ -49,10 +49,14 @@ Generate_Project:
 Build_Windows:
     only: ['web', 'schedules']
     extends: .Build_Windows_
+    tags:
+        - windows
+        - unreal-4.26
     variables:
         GIT_STRATEGY: none   
         GIT_CHECKOUT: "false"
-       #CLIENT_CONFIG: "DebugGame"
+        # CLIENT_CONFIG: "Shipping"
+        CLIENT_CONFIG: "DebugGame"
     needs:
         - job: "Generate_Project"
           artifacts: true
@@ -60,10 +64,14 @@ Build_Windows:
 Build_CentOS:
     only: ['web', 'schedules']
     extends: .Build_CentOS_
+    tags:
+        - centos
+        - unreal-4.26
     variables:
         GIT_STRATEGY: none   
         GIT_CHECKOUT: "false"
-       #CLIENT_CONFIG: "DebugGame"
+        # CLIENT_CONFIG: "Shipping"
+        CLIENT_CONFIG: "DebugGame"
     needs:
         - job: "Generate_Project"
           artifacts: true

shared_scripts.yml

@@ -24,17 +24,22 @@ variables:
   variables: 
     GEN_TEMPLATE_REPO: "https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/unrealprojecttemplate.git"
     GEN_TEMPLATE_BRANCH: "develop"
-    GEN_DEPENDENCIES: "([master@nDisplayExtensions]='https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/ndisplayextensions.git')"
+    GEN_DEPENDENCIES: "()"
+    RUN_SETUP: "true"
   script:
     - find ${CI_PROJECT_DIR} -mindepth 1 -delete
     - declare -A dependencies=$GEN_DEPENDENCIES
-    - git clone -b "${GEN_TEMPLATE_BRANCH}" --single-branch ${GEN_TEMPLATE_REPO} ${CI_PROJECT_DIR}
-    - git clone -b  "${CI_COMMIT_REF_NAME}" --single-branch ${CI_PROJECT_URL}.git/ ${CI_PROJECT_DIR}/Plugins/${CI_PROJECT_NAME}
-    - rm -rf ${CI_PROJECT_DIR}/.git ${CI_PROJECT_DIR}/Plugins/${CI_PROJECT_NAME}/.git
+    - git clone -b "${GEN_TEMPLATE_BRANCH}" --depth 1 --single-branch --recursive ${GEN_TEMPLATE_REPO} ${CI_PROJECT_DIR}
+    - if [[ "${RUN_SETUP}" == "true" ]] ; then
+    -   bash ${CI_PROJECT_DIR}/setup.sh --install-default-plugins
+    - fi
+    - git submodule add ${CI_PROJECT_URL}.git/ ${CI_PROJECT_DIR}/Plugins/${CI_PROJECT_NAME}
+    - cd ${CI_PROJECT_DIR}/Plugins/${CI_PROJECT_NAME} && git checkout ${CI_COMMIT_SHA}
+    - cd ${CI_PROJECT_DIR}
     - for i in "${!dependencies[@]}"; do
-    -   git clone -b "${i%%@*}" --single-branch ${dependencies[$i]} ${CI_PROJECT_DIR}/Plugins/${i#*@}
-    -   rm -rf ${CI_PROJECT_DIR}/Plugins/${i#*@}/.git
+    -   git submodule add -b "${i%%@*}" --depth 1 ${dependencies[$i]} ${CI_PROJECT_DIR}/Plugins/${i#*@}
     - done 
+    - rm -rf ${CI_PROJECT_DIR}/.git 
   artifacts:
     name: "Generated_Project_${CI_PROJECT_NAME}"
     paths: ["."]