Skip to content
Snippets Groups Projects
Commit 63b19304 authored by Sebastian Pape's avatar Sebastian Pape
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request VR-Group/unreal-development/unreal-ci!19
parents 7554819b 9f911ba4
No related branches found
No related tags found
2 merge requests!24Bringing Develop back on Par,!19Develop
...@@ -52,7 +52,7 @@ Build_Windows: ...@@ -52,7 +52,7 @@ Build_Windows:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
GIT_CHECKOUT: "false" GIT_CHECKOUT: "false"
#CLIENT_CONFIG: "Debug" #CLIENT_CONFIG: "DebugGame"
needs: needs:
- job: "Generate_Project" - job: "Generate_Project"
artifacts: true artifacts: true
...@@ -63,7 +63,7 @@ Build_CentOS: ...@@ -63,7 +63,7 @@ Build_CentOS:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
GIT_CHECKOUT: "false" GIT_CHECKOUT: "false"
#CLIENT_CONFIG: "Debug" #CLIENT_CONFIG: "DebugGame"
needs: needs:
- job: "Generate_Project" - job: "Generate_Project"
artifacts: true artifacts: true
......
...@@ -30,13 +30,13 @@ Build_Windows: ...@@ -30,13 +30,13 @@ Build_Windows:
only: ['web', 'schedules'] only: ['web', 'schedules']
extends: .Build_Windows_ extends: .Build_Windows_
#variables: #variables:
# CLIENT_CONFIG: "Debug" # CLIENT_CONFIG: "DebugGame"
Build_CentOS: Build_CentOS:
only: ['web', 'schedules'] only: ['web', 'schedules']
extends: .Build_CentOS_ extends: .Build_CentOS_
#variables: #variables:
# CLIENT_CONFIG: "Debug" # CLIENT_CONFIG: "DebugGame"
Deploy_CAVE: Deploy_CAVE:
only: ['web', 'schedules'] only: ['web', 'schedules']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment