Skip to content

Commit 688c648

Browse files
committed
servo: Merge #13845 - Part of #13551 - Create packages under release/debug directories as appropriate (from birryree:package-under-target-profile-dirs); r=aneeshusa
r? aneeshusa This change implements fixes for #13551 for Linux and MacOS targets. `/python/servo/package_commands.py` was modified so that: - On MacOS, it creates all intermediate packaging directories like `dmg`, `brew`, and `brew-tmp` under `target/(release|debug)`, rather than in `target` directly. - On MacOS, all packaging artifacts (`.dmg`, brew `.tar.gz`) are packaged under `target/(release|debug)`, rather than in `target` directly. - On Linux, the resulting `tar.gz` Servo package is placed under `target/(release|debug)`, rather than in `target`. - Also did some extra cleanup around path parsing in the MacOS packaging code, to use `os.path` methods rather than straight `'/'` parsing with `split` and `join` where it was applicable. `/etc/ci/upload_nightly.sh` was modified to: - Look for artifacts in `target/release` for `mac`, `macbrew`, and `linux` platforms, rather than just `target/`. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #13551 - [x] These changes do not require tests because it is based on CI and packaging tools. They were manually tested for correctness. <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> …lease/debug as specified or detected. Modify macos packaging to create all packages under release/debug directory. Updated etc/ci/upload_nightly.sh to support uploading from either release/debug directory, depending on what was built Source-Repo: https://github.com/servo/servo Source-Revision: 4cb3404c09d0b6a5a19a2c842d2e8809fae31e87 UltraBlame original commit: 834aade043cabd7de06b59c965174667128dc954
1 parent da33a7a commit 688c648

File tree

2 files changed

+184
-262
lines changed

2 files changed

+184
-262
lines changed

servo/etc/ci/upload_nightly.sh

+10-4
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ main
239239
)
240240
{
241241
if
242-
[
243-
[
242+
(
243+
(
244244
"
245245
{
246246
#
@@ -249,8 +249,8 @@ if
249249
!
250250
=
251251
1
252-
]
253-
]
252+
)
253+
)
254254
;
255255
then
256256
usage
@@ -336,6 +336,8 @@ package
336336
=
337337
target
338338
/
339+
release
340+
/
339341
*
340342
.
341343
"
@@ -367,6 +369,8 @@ package
367369
=
368370
target
369371
/
372+
release
373+
/
370374
*
371375
.
372376
"
@@ -400,6 +404,8 @@ package
400404
=
401405
target
402406
/
407+
release
408+
/
403409
brew
404410
/
405411
*

0 commit comments

Comments
 (0)