Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #16219 - servo:jdm-patch-2, r=Wafflespeanut

Browse source 
Fix macOS nightly creation.

Our change to keep around build artifacts broke the macOS nightly generation process, since hdiutil can't cope with the dmg file already existing.

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #16218
- [X] These changes do not require tests because I tested manually and we build every night

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16219)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-31 23:28:13 -05:00 • committed by GitHub
commit 15fc9f3bbf
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/servo/package_commands.py
View file

@ -256,6 +256,10 @@ class PackageCommands(CommandBase):
os.symlink('/Applications', path.join(dir_to_dmg, 'Applications')) os.symlink('/Applications', path.join(dir_to_dmg, 'Applications'))
dmg_path = path.join(target_dir, "servo-tech-demo.dmg") dmg_path = path.join(target_dir, "servo-tech-demo.dmg")
if path.exists(dmg_path):
print("Deleting existing dmg")
os.remove(dmg_path)
try: try:
subprocess.check_call(['hdiutil', 'create', '-volname', 'Servo', dmg_path, '-srcfolder', dir_to_dmg]) subprocess.check_call(['hdiutil', 'create', '-volname', 'Servo', dmg_path, '-srcfolder', dir_to_dmg])
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e: