birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #57 from aws-lumberyard-dev/build/SPEC-5588

Browse Source 
Prevent skipping build if it's from a pull request
This commit is contained in:
Brian Herrera
2021-04-14 17:30:13 -07:00
committed by GitHub
parent 03aaf33b6e a1f0baeeff
commit be85d2ea58
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build/Jenkins/Jenkinsfile
Vendored
+4 -4
View File
@@ -270,7 +270,7 @@ def PreBuildCommonSteps(Map pipelineConfig, String projectName, String pipeline,
if(env.IS_UNIX) pythonCmd = 'sudo -E python -u ' if(env.IS_UNIX) pythonCmd = 'sudo -E python -u '
else pythonCmd = 'python -u ' else pythonCmd = 'python -u '
if(env.RECREATE_VOLUME.toBoolean()) { if(env.RECREATE_VOLUME?.toBoolean()) {
palSh("${pythonCmd} ${INCREMENTAL_BUILD_SCRIPT_PATH} --action delete --project ${projectName} --pipeline ${pipeline} --branch ${branchName} --platform ${platform} --build_type ${buildType}", 'Deleting volume') palSh("${pythonCmd} ${INCREMENTAL_BUILD_SCRIPT_PATH} --action delete --project ${projectName} --pipeline ${pipeline} --branch ${branchName} --platform ${platform} --build_type ${buildType}", 'Deleting volume')
} }
timeout(5) { timeout(5) {
@@ -291,7 +291,7 @@ def PreBuildCommonSteps(Map pipelineConfig, String projectName, String pipeline,
// Cleanup previous repo location, we are currently at the root of the workspace, if we have a .git folder // Cleanup previous repo location, we are currently at the root of the workspace, if we have a .git folder
// we need to cleanup. Once all branches take this relocation, we can remove this // we need to cleanup. Once all branches take this relocation, we can remove this
if(env.CLEAN_WORKSPACE.toBoolean() || fileExists("${workspace}/.git")) { if(env.CLEAN_WORKSPACE?.toBoolean() || fileExists("${workspace}/.git")) {
if(fileExists(workspace)) { if(fileExists(workspace)) {
palRmDir(workspace) palRmDir(workspace)
} }
@@ -315,7 +315,7 @@ def PreBuildCommonSteps(Map pipelineConfig, String projectName, String pipeline,
script: 'python/get_python.bat' script: 'python/get_python.bat'
} }
if(env.CLEAN_OUTPUT_DIRECTORY.toBoolean() || env.CLEAN_ASSETS.toBoolean()) { if(env.CLEAN_OUTPUT_DIRECTORY?.toBoolean() || env.CLEAN_ASSETS?.toBoolean()) {
def command = "${pipelineConfig.BUILD_ENTRY_POINT} --platform ${platform} --type clean" def command = "${pipelineConfig.BUILD_ENTRY_POINT} --platform ${platform} --type clean"
if (env.IS_UNIX) { if (env.IS_UNIX) {
sh label: "Running ${platform} clean", sh label: "Running ${platform} clean",
@@ -457,7 +457,7 @@ try {
} }
} }
if(env.BUILD_NUMBER == '1') { if(env.BUILD_NUMBER == '1' && !branchName.startsWith('PR-')) {
// Exit pipeline early on the intial build. This allows Jenkins to load the pipeline for the branch and enables users // Exit pipeline early on the intial build. This allows Jenkins to load the pipeline for the branch and enables users
// to select build parameters on their first actual build. See https://issues.jenkins.io/browse/JENKINS-41929 // to select build parameters on their first actual build. See https://issues.jenkins.io/browse/JENKINS-41929
currentBuild.result = 'SUCCESS' currentBuild.result = 'SUCCESS'