mirror of
https://github.com/servo/servo.git
synced 2025-08-10 16:05:43 +01:00
Auto merge of #13845 - birryree:package-under-target-profile-dirs, r=aneeshusa
Part of #13551 - Create packages under release/debug directories as appropriate 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 <!-- 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/13845) <!-- Reviewable:end -->
This commit is contained in:
commit
4cb3404c09
2 changed files with 44 additions and 36 deletions
|
@ -28,7 +28,7 @@ upload() {
|
|||
|
||||
|
||||
main() {
|
||||
if [[ "${#}" != 1 ]]; then
|
||||
if (( "${#}" != 1 )); then
|
||||
usage >&2
|
||||
return 1
|
||||
fi
|
||||
|
@ -41,13 +41,13 @@ main() {
|
|||
package=target/arm-linux-androideabi/release/*."${extension}"
|
||||
elif [[ "${platform}" == "linux" ]]; then
|
||||
extension=tar.gz
|
||||
package=target/*."${extension}"
|
||||
package=target/release/*."${extension}"
|
||||
elif [[ "${platform}" == "mac" ]]; then
|
||||
extension=dmg
|
||||
package=target/*."${extension}"
|
||||
package=target/release/*."${extension}"
|
||||
elif [[ "${platform}" == "macbrew" ]]; then
|
||||
extension=tar.gz
|
||||
package=target/brew/*."${extension}"
|
||||
package=target/release/brew/*."${extension}"
|
||||
elif [[ "${platform}" == "windows" ]]; then
|
||||
extension=msi
|
||||
package=target/release/msi/*.msi
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue