Skip to content

Commit 3be350b

Browse files
committed
Do not clean the Xcode build folder if the action specifies 'clean_build' to be 'false'
Without this fix, GIT command cleaned the build folder even if the action specified 'clean_build' to be 'false'. This fix allows an individual action to skip clean when 'clean_build' is explicitly set 'false'.
1 parent d2b1f51 commit 3be350b

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

project_future.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,12 @@ def __init__(self, swiftc, swift_version, swift_branch, job_type,
10561056
self.current_platform = platform.system()
10571057
self.added_swift_flags = added_swift_flags
10581058
self.added_xcodebuild_flags = added_xcodebuild_flags
1059-
self.skip_clean = skip_clean
1059+
# Make sure Xcode build folder is not cleaned by 'git' when
1060+
# 'clean_build' is explicitly set 'false'.
1061+
clean_build = True
1062+
if 'clean_build' in action:
1063+
clean_build = action['clean_build']
1064+
self.skip_clean = skip_clean or not clean_build
10601065
self.build_config = build_config
10611066
self.strip_resource_phases = strip_resource_phases
10621067
self.time_reporter = time_reporter

0 commit comments

Comments
 (0)